Skip to content

[FlowSensitive] [StatusOr] [14/N] Support nested StatusOrs #170950

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
fmayer merged 11 commits into from
Dec 10, 2025
+207 −0
Merged

[FlowSensitive] [StatusOr] [14/N] Support nested StatusOrs #170950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
06aaba5
[𝘀𝗽𝗿] changes to main this commit is based on
fmayer Dec 5, 2025
698cd1d
[𝘀𝗽𝗿] initial version
fmayer Dec 5, 2025
24d0cf0
[𝘀𝗽𝗿] changes introduced through rebase
fmayer Dec 8, 2025
09c625d
rebase
fmayer Dec 8, 2025
53835d4
[𝘀𝗽𝗿] changes introduced through rebase
fmayer Dec 8, 2025
629660f
rebase\
fmayer Dec 8, 2025
8e8d92c
[𝘀𝗽𝗿] changes introduced through rebase
fmayer Dec 10, 2025
affe730
update
fmayer Dec 10, 2025
454f37b
types
fmayer Dec 10, 2025
f02146d
[𝘀𝗽𝗿] changes introduced through rebase
razvanlupusoru Dec 10, 2025
382c828
rebase
fmayer Dec 10, 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
36 changes: 36 additions & 0 deletions clang/lib/Analysis/FlowSensitive/Models/UncheckedStatusOrAccessModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1044,6 +1044,36 @@ transferAssertionResultOperatorBoolCall(const CXXMemberCallExpr *Expr,
State.Env.setValue(*Expr, Res);
}

static void transferDerefCall(const CXXOperatorCallExpr *Expr,
const MatchFinder::MatchResult &,
LatticeTransferState &State) {
auto *StatusOrLoc = State.Env.get<RecordStorageLocation>(*Expr->getArg(0));

if (StatusOrLoc && State.Env.getStorageLocation(*Expr) == nullptr)
State.Env.setStorageLocation(*Expr,
StatusOrLoc->getSyntheticField("value"));
}

static void transferArrowCall(const CXXOperatorCallExpr *Expr,
const MatchFinder::MatchResult &,
LatticeTransferState &State) {
auto *StatusOrLoc = State.Env.get<RecordStorageLocation>(*Expr->getArg(0));
if (!StatusOrLoc)
return;
State.Env.setValue(*Expr, State.Env.create<PointerValue>(
StatusOrLoc->getSyntheticField("value")));
}
Copy link
Contributor

@jvoung jvoung Dec 10, 2025

Choose a reason for hiding this comment

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

these are probably most common for nesting, but could it be possible to have a foo.value().value() ?

Copy link
Contributor Author

@fmayer fmayer Dec 10, 2025

Choose a reason for hiding this comment

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

done


static void transferValueCall(const CXXMemberCallExpr *Expr,
const MatchFinder::MatchResult &,
LatticeTransferState &State) {
auto *StatusOrLoc = getImplicitObjectLocation(*Expr, State.Env);

if (StatusOrLoc && State.Env.getStorageLocation(*Expr) == nullptr)
State.Env.setStorageLocation(*Expr,
StatusOrLoc->getSyntheticField("value"));
}

static RecordStorageLocation *
getSmartPtrLikeStorageLocation(const Expr &E, const Environment &Env) {
if (!E.isPRValue())
Expand Down Expand Up @@ -1130,6 +1160,12 @@ buildTransferMatchSwitch(ASTContext &Ctx,
transferValueAssignmentCall)
.CaseOfCFGStmt<CXXConstructExpr>(isStatusOrValueConstructor(),
transferValueConstructor)
.CaseOfCFGStmt<CXXOperatorCallExpr>(isStatusOrOperatorCallWithName("->"),
transferArrowCall)
.CaseOfCFGStmt<CXXOperatorCallExpr>(isStatusOrOperatorCallWithName("*"),
transferDerefCall)
.CaseOfCFGStmt<CXXMemberCallExpr>(isStatusOrMemberCallWithName("value"),
transferValueCall)
.CaseOfCFGStmt<CallExpr>(isAsStatusCallWithStatus(),
transferAsStatusCallWithStatus)
.CaseOfCFGStmt<CallExpr>(isAsStatusCallWithStatusOr(),
Expand Down
171 changes: 171 additions & 0 deletions clang/unittests/Analysis/FlowSensitive/UncheckedStatusOrAccessModelTestFixture.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3419,6 +3419,15 @@ TEST_P(UncheckedStatusOrAccessModelTest, NestedStatusOr) {
result.value();
}
)cc");
ExpectDiagnosticsFor(R"cc(
#include "unchecked_statusor_access_test_defs.h"

void target() {
absl::StatusOr<STATUSOR_INT> result = Make<STATUSOR_INT>();
if (result.value().ok())
result.value().value();
}
)cc");
}

TEST_P(UncheckedStatusOrAccessModelTest, PtrConstruct) {
Expand Down Expand Up @@ -3739,6 +3748,168 @@ TEST_P(UncheckedStatusOrAccessModelTest, UniquePtrReset) {
)cc");
}

TEST_P(UncheckedStatusOrAccessModelTest, NestedStatusOrInStatusOrStruct) {
// Non-standard assignment with a nested StatusOr.
ExpectDiagnosticsFor(
R"cc(
#include "unchecked_statusor_access_test_defs.h"

struct Inner {
absl::StatusOr<std::string> sor;
};

struct Outer {
absl::StatusOr<Inner> inner;
};

void target() {
Outer foo = Make<Outer>();
foo.inner->sor = "a"; // [[unsafe]]
}
)cc");

ExpectDiagnosticsFor(
R"cc(
#include "unchecked_statusor_access_test_defs.h"

struct Foo {
absl::StatusOr<std::string> sor;
};

void target(const absl::StatusOr<Foo>& foo) {
if (foo.ok() && foo->sor.ok()) foo->sor.value();
}
)cc");

ExpectDiagnosticsFor(
R"cc(
#include "unchecked_statusor_access_test_defs.h"

struct Foo {
absl::StatusOr<std::string> sor;
};

void target(const absl::StatusOr<Foo>& foo) {
if (foo.ok() && foo.value().sor.ok()) foo->sor.value();
}
)cc");

ExpectDiagnosticsFor(
R"cc(
#include "unchecked_statusor_access_test_defs.h"

struct Foo {
absl::StatusOr<std::string> sor;
};

void target(const absl::StatusOr<Foo>& foo) {
if (foo.ok() && (*foo).sor.ok()) (*foo).sor.value();
}
)cc");

ExpectDiagnosticsFor(
R"cc(
#include "unchecked_statusor_access_test_defs.h"

struct Foo {
absl::StatusOr<std::string> sor;
};

void target(absl::StatusOr<Foo>& foo) {
if (foo.ok() && foo->sor.ok()) *foo->sor;
}
)cc");
// With assignment.
ExpectDiagnosticsFor(
R"cc(
#include "unchecked_statusor_access_test_defs.h"

struct Foo {
absl::StatusOr<std::string> sor;
};

void target(absl::StatusOr<Foo>& foo) {
if (foo.ok() && foo->sor.ok()) {
foo->sor = Make<absl::StatusOr<std::string>>();
foo->sor.value(); // [[unsafe]]
}
}
)cc");

ExpectDiagnosticsFor(
R"cc(
#include "unchecked_statusor_access_test_defs.h"

struct Foo {
absl::StatusOr<std::string> sor;
};

void target(absl::StatusOr<Foo>& foo) {
if (foo.ok() && foo->sor.ok()) {
auto n = Make<absl::StatusOr<std::string>>();
if (n.ok()) foo->sor = n;
foo->sor.value();
}
}
)cc");

ExpectDiagnosticsFor(
R"cc(
#include "unchecked_statusor_access_test_defs.h"

struct Foo {
absl::StatusOr<std::string> sor;
};

void target(absl::StatusOr<Foo>& foo) {
if (foo.ok() && foo->sor.ok()) {
auto n = Make<absl::StatusOr<std::string>>();
if (n.ok()) foo->sor = std::move(n);
foo->sor.value();
}
}
)cc");

// More complicated conditionals.
ExpectDiagnosticsFor(
Copy link
Contributor

@jvoung jvoung Dec 10, 2025

Choose a reason for hiding this comment

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

maybe add a comment to split this from the // With assignment. -- starting a new section for say more complex conditionals

Copy link
Contributor Author

@fmayer fmayer Dec 10, 2025

Choose a reason for hiding this comment

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

done

R"cc(
#include "unchecked_statusor_access_test_defs.h"

struct Foo {
absl::StatusOr<std::string> sor;
};

void target(absl::StatusOr<Foo>& foo) {
if (!foo.ok()) return;
if (!foo->sor.ok())
foo->sor.value(); // [[unsafe]]
else
foo->sor.value();
}
)cc");

ExpectDiagnosticsFor(
R"cc(
#include "unchecked_statusor_access_test_defs.h"

struct Foo {
absl::StatusOr<std::string> sor;
};

void target(absl::StatusOr<Foo>& foo, bool b) {
if (!foo.ok()) return;
if (b) {
if (!foo->sor.ok()) return;
foo->sor.value();
} else {
if (!foo->sor.ok()) return;
foo->sor.value();
}
foo->sor.value();
}
)cc");
}

} // namespace

std::string
Expand Down
Loading