-
Notifications
You must be signed in to change notification settings - Fork 15.5k
[FlowSensitive] [StatusOr] [11/N] Assume const accessor calls are stable #170935
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.
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
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -237,6 +237,49 @@ static auto isAsStatusCallWithStatusOr() { | |
| hasArgument(0, hasType(statusOrType()))); | ||
| } | ||
|
|
||
| static auto possiblyReferencedStatusOrType() { | ||
| using namespace ::clang::ast_matchers; // NOLINT: Too many names | ||
| return anyOf(statusOrType(), referenceType(pointee(statusOrType()))); | ||
| } | ||
|
|
||
| static auto isConstStatusOrAccessorMemberCall() { | ||
| using namespace ::clang::ast_matchers; // NOLINT: Too many names | ||
| return cxxMemberCallExpr(callee( | ||
| cxxMethodDecl(parameterCountIs(0), isConst(), | ||
| returns(qualType(possiblyReferencedStatusOrType()))))); | ||
| } | ||
|
|
||
| static auto isConstStatusOrAccessorMemberOperatorCall() { | ||
| using namespace ::clang::ast_matchers; // NOLINT: Too many names | ||
| return cxxOperatorCallExpr( | ||
| callee(cxxMethodDecl(parameterCountIs(0), isConst(), | ||
| returns(possiblyReferencedStatusOrType())))); | ||
| } | ||
|
|
||
| static auto isConstStatusOrPointerAccessorMemberCall() { | ||
| using namespace ::clang::ast_matchers; // NOLINT: Too many names | ||
| return cxxMemberCallExpr(callee(cxxMethodDecl( | ||
| parameterCountIs(0), isConst(), | ||
| returns(pointerType(pointee(possiblyReferencedStatusOrType())))))); | ||
| } | ||
|
|
||
| static auto isConstStatusOrPointerAccessorMemberOperatorCall() { | ||
| using namespace ::clang::ast_matchers; // NOLINT: Too many names | ||
| return cxxOperatorCallExpr(callee(cxxMethodDecl( | ||
| parameterCountIs(0), isConst(), | ||
| returns(pointerType(pointee(possiblyReferencedStatusOrType())))))); | ||
| } | ||
|
|
||
| static auto isNonConstMemberCall() { | ||
| using namespace ::clang::ast_matchers; // NOLINT: Too many names | ||
| return cxxMemberCallExpr(callee(cxxMethodDecl(unless(isConst())))); | ||
| } | ||
|
|
||
| static auto isNonConstMemberOperatorCall() { | ||
| using namespace ::clang::ast_matchers; // NOLINT: Too many names | ||
| return cxxOperatorCallExpr(callee(cxxMethodDecl(unless(isConst())))); | ||
| } | ||
|
|
||
| static auto | ||
| buildDiagnoseMatchSwitch(const UncheckedStatusOrAccessModelOptions &Options) { | ||
| return CFGMatchSwitchBuilder<const Environment, | ||
|
|
@@ -697,6 +740,107 @@ static void transferPointerToBoolean(const ImplicitCastExpr *Expr, | |
| dyn_cast_or_null<BoolValue>(State.Env.getValue(*Expr->getSubExpr()))) | ||
| State.Env.setValue(*Expr, *SubExprVal); | ||
| } | ||
| static void handleConstStatusOrAccessorMemberCall( | ||
| const CallExpr *Expr, RecordStorageLocation *RecordLoc, | ||
| const MatchFinder::MatchResult &Result, LatticeTransferState &State) { | ||
| assert(isStatusOrType(Expr->getType())); | ||
| if (RecordLoc == nullptr) | ||
| return; | ||
| const FunctionDecl *DirectCallee = Expr->getDirectCallee(); | ||
| if (DirectCallee == nullptr) | ||
| return; | ||
| StorageLocation &Loc = | ||
| State.Lattice.getOrCreateConstMethodReturnStorageLocation( | ||
| *RecordLoc, DirectCallee, State.Env, [&](StorageLocation &Loc) { | ||
| initializeStatusOr(cast<RecordStorageLocation>(Loc), State.Env); | ||
| }); | ||
| if (Expr->isPRValue()) { | ||
| auto &ResultLoc = State.Env.getResultObjectLocation(*Expr); | ||
| copyRecord(cast<RecordStorageLocation>(Loc), ResultLoc, State.Env); | ||
| } else { | ||
| State.Env.setStorageLocation(*Expr, Loc); | ||
| } | ||
| } | ||
|
|
||
| static void handleConstStatusOrPointerAccessorMemberCall( | ||
| const CallExpr *Expr, RecordStorageLocation *RecordLoc, | ||
| const MatchFinder::MatchResult &Result, LatticeTransferState &State) { | ||
| if (RecordLoc == nullptr) | ||
| return; | ||
| auto *Val = State.Lattice.getOrCreateConstMethodReturnValue(*RecordLoc, Expr, | ||
| State.Env); | ||
| State.Env.setValue(*Expr, *Val); | ||
| } | ||
|
|
||
| static void | ||
| transferConstStatusOrAccessorMemberCall(const CXXMemberCallExpr *Expr, | ||
| const MatchFinder::MatchResult &Result, | ||
| LatticeTransferState &State) { | ||
| handleConstStatusOrAccessorMemberCall( | ||
| Expr, getImplicitObjectLocation(*Expr, State.Env), Result, State); | ||
| } | ||
|
|
||
| static void transferConstStatusOrAccessorMemberOperatorCall( | ||
| const CXXOperatorCallExpr *Expr, const MatchFinder::MatchResult &Result, | ||
| LatticeTransferState &State) { | ||
| auto *RecordLoc = cast_or_null<RecordStorageLocation>( | ||
| State.Env.getStorageLocation(*Expr->getArg(0))); | ||
| handleConstStatusOrAccessorMemberCall(Expr, RecordLoc, Result, State); | ||
| } | ||
|
|
||
| static void transferConstStatusOrPointerAccessorMemberCall( | ||
| const CXXMemberCallExpr *Expr, const MatchFinder::MatchResult &Result, | ||
| LatticeTransferState &State) { | ||
| handleConstStatusOrPointerAccessorMemberCall( | ||
| Expr, getImplicitObjectLocation(*Expr, State.Env), Result, State); | ||
| } | ||
|
|
||
| static void transferConstStatusOrPointerAccessorMemberOperatorCall( | ||
| const CXXOperatorCallExpr *Expr, const MatchFinder::MatchResult &Result, | ||
| LatticeTransferState &State) { | ||
| auto *RecordLoc = cast_or_null<RecordStorageLocation>( | ||
| State.Env.getStorageLocation(*Expr->getArg(0))); | ||
| handleConstStatusOrPointerAccessorMemberCall(Expr, RecordLoc, Result, State); | ||
| } | ||
|
|
||
| static void transferStatusOrReturningCall(const CallExpr *Expr, | ||
| LatticeTransferState &State) { | ||
| RecordStorageLocation *StatusOrLoc = | ||
| Expr->isPRValue() ? &State.Env.getResultObjectLocation(*Expr) | ||
| : State.Env.get<RecordStorageLocation>(*Expr); | ||
| if (StatusOrLoc != nullptr && | ||
| State.Env.getValue(locForOk(locForStatus(*StatusOrLoc))) == nullptr) | ||
| initializeStatusOr(*StatusOrLoc, State.Env); | ||
| } | ||
|
|
||
| static void handleNonConstMemberCall(const CallExpr *Expr, | ||
| RecordStorageLocation *RecordLoc, | ||
| const MatchFinder::MatchResult &Result, | ||
| LatticeTransferState &State) { | ||
| if (RecordLoc == nullptr) | ||
| return; | ||
|
||
| State.Lattice.clearConstMethodReturnValues(*RecordLoc); | ||
| State.Lattice.clearConstMethodReturnStorageLocations(*RecordLoc); | ||
|
|
||
| if (isStatusOrType(Expr->getType())) | ||
| transferStatusOrReturningCall(Expr, State); | ||
| } | ||
|
|
||
| static void transferNonConstMemberCall(const CXXMemberCallExpr *Expr, | ||
| const MatchFinder::MatchResult &Result, | ||
| LatticeTransferState &State) { | ||
| handleNonConstMemberCall(Expr, getImplicitObjectLocation(*Expr, State.Env), | ||
| Result, State); | ||
| } | ||
|
|
||
| static void | ||
| transferNonConstMemberOperatorCall(const CXXOperatorCallExpr *Expr, | ||
| const MatchFinder::MatchResult &Result, | ||
| LatticeTransferState &State) { | ||
| auto *RecordLoc = cast_or_null<RecordStorageLocation>( | ||
| State.Env.getStorageLocation(*Expr->getArg(0))); | ||
| handleNonConstMemberCall(Expr, RecordLoc, Result, State); | ||
| } | ||
|
|
||
| CFGMatchSwitch<LatticeTransferState> | ||
| buildTransferMatchSwitch(ASTContext &Ctx, | ||
|
|
@@ -755,6 +899,23 @@ buildTransferMatchSwitch(ASTContext &Ctx, | |
| transferLoggingGetReferenceableValueCall) | ||
| .CaseOfCFGStmt<CallExpr>(isLoggingCheckEqImpl(), | ||
| transferLoggingCheckEqImpl) | ||
| // const accessor calls | ||
| .CaseOfCFGStmt<CXXMemberCallExpr>(isConstStatusOrAccessorMemberCall(), | ||
| transferConstStatusOrAccessorMemberCall) | ||
| .CaseOfCFGStmt<CXXOperatorCallExpr>( | ||
| isConstStatusOrAccessorMemberOperatorCall(), | ||
| transferConstStatusOrAccessorMemberOperatorCall) | ||
| .CaseOfCFGStmt<CXXMemberCallExpr>( | ||
| isConstStatusOrPointerAccessorMemberCall(), | ||
| transferConstStatusOrPointerAccessorMemberCall) | ||
| .CaseOfCFGStmt<CXXOperatorCallExpr>( | ||
| isConstStatusOrPointerAccessorMemberOperatorCall(), | ||
| transferConstStatusOrPointerAccessorMemberOperatorCall) | ||
| // non-const member calls that may modify the state of an object. | ||
| .CaseOfCFGStmt<CXXMemberCallExpr>(isNonConstMemberCall(), | ||
| transferNonConstMemberCall) | ||
| .CaseOfCFGStmt<CXXOperatorCallExpr>(isNonConstMemberOperatorCall(), | ||
| transferNonConstMemberOperatorCall) | ||
| // N.B. These need to come after all other CXXConstructExpr. | ||
| // These are there to make sure that every Status and StatusOr object | ||
| // have their ok boolean initialized when constructed. If we were to | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3270,6 +3270,179 @@ TEST_P(UncheckedStatusOrAccessModelTest, ConstructStatusFromReference) { | |
| )cc"); | ||
| } | ||
|
|
||
| TEST_P(UncheckedStatusOrAccessModelTest, AccessorCall) { | ||
| // Accessor returns reference. | ||
| ExpectDiagnosticsFor( | ||
| R"cc( | ||
| #include "unchecked_statusor_access_test_defs.h" | ||
|
|
||
| struct Foo { | ||
| STATUSOR_INT sor_; | ||
|
|
||
| const STATUSOR_INT& sor() const { return sor_; } | ||
| }; | ||
|
|
||
| void target(Foo foo) { | ||
| if (foo.sor().ok()) foo.sor().value(); | ||
| } | ||
| )cc"); | ||
|
|
||
| // Uses an operator | ||
| ExpectDiagnosticsFor( | ||
| R"cc( | ||
| #include "unchecked_statusor_access_test_defs.h" | ||
|
|
||
| struct Foo { | ||
| STATUSOR_INT sor_; | ||
|
|
||
| const STATUSOR_INT& operator()() const { return sor_; } | ||
| }; | ||
|
|
||
| void target(Foo foo) { | ||
| if (foo().ok()) foo().value(); | ||
| } | ||
| )cc"); | ||
|
|
||
| // Calls nonconst method inbetween. | ||
|
||
| ExpectDiagnosticsFor( | ||
| R"cc( | ||
| #include "unchecked_statusor_access_test_defs.h" | ||
|
|
||
| struct Foo { | ||
| STATUSOR_INT sor_; | ||
|
|
||
| void invalidate() {} | ||
|
|
||
| const STATUSOR_INT& sor() const { return sor_; } | ||
| }; | ||
|
|
||
| void target(Foo foo) { | ||
| if (foo.sor().ok()) { | ||
| foo.invalidate(); | ||
| foo.sor().value(); // [[unsafe]] | ||
| } | ||
| } | ||
| )cc"); | ||
|
|
||
| // Calls nonconst operator inbetween. | ||
| ExpectDiagnosticsFor( | ||
| R"cc( | ||
| #include "unchecked_statusor_access_test_defs.h" | ||
|
|
||
| struct Foo { | ||
| STATUSOR_INT sor_; | ||
|
|
||
| void operator()() {} | ||
|
|
||
| const STATUSOR_INT& sor() const { return sor_; } | ||
| }; | ||
|
|
||
| void target(Foo foo) { | ||
| if (foo.sor().ok()) { | ||
| foo(); | ||
| foo.sor().value(); // [[unsafe]] | ||
| } | ||
| } | ||
| )cc"); | ||
|
|
||
| // Accessor returns copy. | ||
| ExpectDiagnosticsFor( | ||
| R"cc( | ||
| #include "unchecked_statusor_access_test_defs.h" | ||
|
|
||
| struct Foo { | ||
| STATUSOR_INT sor_; | ||
|
|
||
| STATUSOR_INT sor() const { return sor_; } | ||
| }; | ||
|
|
||
| void target(Foo foo) { | ||
| if (foo.sor().ok()) foo.sor().value(); | ||
| } | ||
| )cc"); | ||
|
|
||
| // Non-const accessor. | ||
| ExpectDiagnosticsFor( | ||
| R"cc( | ||
| #include "unchecked_statusor_access_test_defs.h" | ||
|
|
||
| struct Foo { | ||
| STATUSOR_INT sor_; | ||
|
|
||
| const STATUSOR_INT& sor() { return sor_; } | ||
| }; | ||
|
|
||
| void target(Foo foo) { | ||
| if (foo.sor().ok()) foo.sor().value(); // [[unsafe]] | ||
| } | ||
| )cc"); | ||
|
|
||
| // Non-const rvalue accessor. | ||
| ExpectDiagnosticsFor( | ||
| R"cc( | ||
| #include "unchecked_statusor_access_test_defs.h" | ||
|
|
||
| struct Foo { | ||
| STATUSOR_INT sor_; | ||
|
|
||
| STATUSOR_INT&& sor() { return std::move(sor_); } | ||
| }; | ||
|
|
||
| void target(Foo foo) { | ||
| if (foo.sor().ok()) foo.sor().value(); // [[unsafe]] | ||
| } | ||
| )cc"); | ||
|
|
||
| // const pointer accessor. | ||
| ExpectDiagnosticsFor( | ||
| R"cc( | ||
| #include "unchecked_statusor_access_test_defs.h" | ||
|
|
||
| struct Foo { | ||
| STATUSOR_INT sor_; | ||
|
|
||
| const STATUSOR_INT* sor() const { return &sor_; } | ||
| }; | ||
|
|
||
| void target(Foo foo) { | ||
| if (foo.sor()->ok()) foo.sor()->value(); | ||
| } | ||
| )cc"); | ||
|
|
||
| // const pointer operator. | ||
| ExpectDiagnosticsFor( | ||
| R"cc( | ||
| #include "unchecked_statusor_access_test_defs.h" | ||
|
|
||
| struct Foo { | ||
| STATUSOR_INT sor_; | ||
|
|
||
| const STATUSOR_INT* operator->() const { return &sor_; } | ||
| }; | ||
|
|
||
| void target(Foo foo) { | ||
| if (foo->ok()) foo->value(); | ||
| } | ||
| )cc"); | ||
|
|
||
| // We copy the result of the accessor. | ||
| ExpectDiagnosticsFor(R"cc( | ||
| #include "unchecked_statusor_access_test_defs.h" | ||
|
|
||
| struct Foo { | ||
| STATUSOR_INT sor_; | ||
|
|
||
| const STATUSOR_INT& sor() const { return sor_; } | ||
| }; | ||
| void target() { | ||
| Foo foo; | ||
| if (!foo.sor().ok()) return; | ||
| const auto sor = foo.sor(); | ||
| sor.value(); | ||
| } | ||
| )cc"); | ||
| } | ||
|
|
||
| } // namespace | ||
|
|
||
| std::string | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it make sense to do the default handling of
"if (isStatusOrType(Expr->getType())) transferStatusOrReturningCall(Expr, State);"
when DirectCallee is null?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done