Skip to content

Commit

Permalink
[Sema] Fix null pointer dereference handleAlwaysInlineAttr.
Browse files Browse the repository at this point in the history
It's possible for `getCalleeDecl()` to return a null pointer.

This was encountered by a user of our downstream compiler.

The case involved a DependentScopeDeclRefExpr.

Since this seems to only be for a warning diagnostic, I skipped
the diagnostic check if it returned null. But mabye there's a
different way to fix this.

Reviewed By: erichkeane

Differential Revision: https://reviews.llvm.org/D146089
  • Loading branch information
topperc committed Mar 17, 2023
1 parent a7aade1 commit 1029747
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 2 deletions.
5 changes: 3 additions & 2 deletions clang/lib/Sema/SemaStmtAttr.cpp
Expand Up @@ -233,7 +233,8 @@ static Attr *handleNoInlineAttr(Sema &S, Stmt *St, const ParsedAttr &A,

for (const auto *CallExpr : CEF.getCallExprs()) {
const Decl *Decl = CallExpr->getCalleeDecl();
if (Decl->hasAttr<AlwaysInlineAttr>() || Decl->hasAttr<FlattenAttr>())
if (Decl &&
(Decl->hasAttr<AlwaysInlineAttr>() || Decl->hasAttr<FlattenAttr>()))
S.Diag(St->getBeginLoc(), diag::warn_function_stmt_attribute_precedence)
<< A << (Decl->hasAttr<AlwaysInlineAttr>() ? 0 : 1);
}
Expand All @@ -259,7 +260,7 @@ static Attr *handleAlwaysInlineAttr(Sema &S, Stmt *St, const ParsedAttr &A,

for (const auto *CallExpr : CEF.getCallExprs()) {
const Decl *Decl = CallExpr->getCalleeDecl();
if (Decl->hasAttr<NoInlineAttr>() || Decl->hasAttr<FlattenAttr>())
if (Decl && (Decl->hasAttr<NoInlineAttr>() || Decl->hasAttr<FlattenAttr>()))
S.Diag(St->getBeginLoc(), diag::warn_function_stmt_attribute_precedence)
<< A << (Decl->hasAttr<NoInlineAttr>() ? 2 : 1);
}
Expand Down
19 changes: 19 additions & 0 deletions clang/test/Sema/attr-alwaysinline.cpp
Expand Up @@ -25,3 +25,22 @@ void foo() {
}

[[clang::always_inline]] static int i = bar(); // expected-warning {{'always_inline' attribute only applies to functions and statements}}

// This used to crash the compiler.
template<int D>
int foo(int x) {
if constexpr (D > 1)
[[clang::always_inline]] return foo<D-1>(x + 1);
else
return x;
}

// FIXME: This should warn that always_inline statement attribute has higher
// precedence than the noinline function attribute.
template<int D> [[gnu::noinline]]
int bar(int x) {
if constexpr (D > 1)
[[clang::always_inline]] return bar<D-1>(x + 1);
else
return x;
}
19 changes: 19 additions & 0 deletions clang/test/Sema/attr-noinline.cpp
Expand Up @@ -25,3 +25,22 @@ void foo() {
}

[[clang::noinline]] static int i = bar(); // expected-warning {{'noinline' attribute only applies to functions and statements}}

// This used to crash the compiler.
template<int D>
int foo(int x) {
if constexpr (D > 1)
[[clang::noinline]] return foo<D-1>(x + 1);
else
return x;
}

// FIXME: This should warn that noinline statement attribute has higher
// precedence than the always_inline function attribute.
template<int D> [[clang::always_inline]]
int bar(int x) {
if constexpr (D > 1)
[[clang::noinline]] return bar<D-1>(x + 1);
else
return x;
}

0 comments on commit 1029747

Please sign in to comment.