diff options
author | Reid Kleckner <rnk@google.com> | 2018-03-12 21:43:02 +0000 |
---|---|---|
committer | Reid Kleckner <rnk@google.com> | 2018-03-12 21:43:02 +0000 |
commit | 49c32abef3432696ce360d7576ea09a5ae08e7a7 (patch) | |
tree | fc94b0b3a5de71ac8c0b42d11a08bef70e8a003b /lib/Sema/SemaLookup.cpp | |
parent | 07fe671aaad3e93b9f7178ae1309304a73a3b3bf (diff) |
Re-land "[Sema] Make getCurFunction() return null outside function parsing"
This relands r326965.
There was a null dereference in typo correction that was triggered in
Sema/diagnose_if.c. We are not always in a function scope when doing
typo correction. The fix is to add a null check.
LLVM's optimizer made it hard to find this bug. I wrote it up in a
not-very-well-editted blog post here:
http://qinsb.blogspot.com/2018/03/ub-will-delete-your-null-checks.html
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@327334 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaLookup.cpp')
-rw-r--r-- | lib/Sema/SemaLookup.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Sema/SemaLookup.cpp b/lib/Sema/SemaLookup.cpp index dd54fb4ad9..692ce111aa 100644 --- a/lib/Sema/SemaLookup.cpp +++ b/lib/Sema/SemaLookup.cpp @@ -4529,7 +4529,8 @@ static void AddKeywordsToConsumer(Sema &SemaRef, if (S && S->getContinueParent()) Consumer.addKeywordResult("continue"); - if (!SemaRef.getCurFunction()->SwitchStack.empty()) { + if (SemaRef.getCurFunction() && + !SemaRef.getCurFunction()->SwitchStack.empty()) { Consumer.addKeywordResult("case"); Consumer.addKeywordResult("default"); } |