diff --git a/clang-tools-extra/clang-tidy/readability/ElseAfterReturnCheck.cpp b/clang-tools-extra/clang-tidy/readability/ElseAfterReturnCheck.cpp --- a/clang-tools-extra/clang-tidy/readability/ElseAfterReturnCheck.cpp +++ b/clang-tools-extra/clang-tidy/readability/ElseAfterReturnCheck.cpp @@ -27,6 +27,8 @@ static const char WarnOnUnfixableStr[] = "WarnOnUnfixable"; const DeclRefExpr *findUsage(const Stmt *Node, int64_t DeclIdentifier) { + if (!Node) + return nullptr; if (const auto *DeclRef = dyn_cast(Node)) { if (DeclRef->getDecl()->getID() == DeclIdentifier) { return DeclRef; @@ -44,6 +46,8 @@ const DeclRefExpr * findUsageRange(const Stmt *Node, const llvm::iterator_range &DeclIdentifiers) { + if (!Node) + return nullptr; if (const auto *DeclRef = dyn_cast(Node)) { if (llvm::is_contained(DeclIdentifiers, DeclRef->getDecl()->getID())) { return DeclRef; diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/readability-else-after-return.cpp @@ -213,3 +213,16 @@ return b; } } + +void test_B44745() { + // This is the actual minimum test case for the crash in bug 44745. We aren't + // too worried about the warning or fix here, more we don't want a crash. + // CHECK-MESSAGES: :[[@LINE+3]]:5: warning: do not use 'else' after 'return' [readability-else-after-return] + if (auto X = false) { + return; + } else { + for (;;) { + } + } + return; +} \ No newline at end of file