maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Don't do jump-scope checking when code completion is enabled. It's 

both a waste of time, and prone to crash due to the use of the
error-recovery path in parser. Fixes <rdar://problem/12103608>, which
has been driving me nuts.

llvm-svn: 162081
This commit is contained in:
Douglas Gregor 2012-08-17 05:12:08 +00:00
parent 8d9ccdc7a5
commit 5d944dbf1a
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/lib/Sema/SemaDecl.cpp
View File

@ -7792,7 +7792,8 @@ Decl *Sema::ActOnFinishFunctionBody(Decl *dcl, Stmt *Body,
// Verify that gotos and switch cases don't jump into scopes illegally. // Verify that gotos and switch cases don't jump into scopes illegally.
if (getCurFunction()->NeedsScopeChecking() && if (getCurFunction()->NeedsScopeChecking() &&
!dcl->isInvalidDecl() && !dcl->isInvalidDecl() &&
!hasAnyUnrecoverableErrorsInThisFunction()) !hasAnyUnrecoverableErrorsInThisFunction() &&
!PP.isCodeCompletionEnabled())
DiagnoseInvalidJumps(Body); DiagnoseInvalidJumps(Body);
if (CXXDestructorDecl *Destructor = dyn_cast<CXXDestructorDecl>(dcl)) { if (CXXDestructorDecl *Destructor = dyn_cast<CXXDestructorDecl>(dcl)) {

3
clang/lib/Sema/SemaExpr.cpp
View File

@ -9461,7 +9461,8 @@ ExprResult Sema::ActOnBlockStmtExpr(SourceLocation CaretLoc,
// If needed, diagnose invalid gotos and switches in the block. // If needed, diagnose invalid gotos and switches in the block.
if (getCurFunction()->NeedsScopeChecking() && if (getCurFunction()->NeedsScopeChecking() &&
!hasAnyUnrecoverableErrorsInThisFunction()) !hasAnyUnrecoverableErrorsInThisFunction() &&
!PP.isCodeCompletionEnabled())
DiagnoseInvalidJumps(cast<CompoundStmt>(Body)); DiagnoseInvalidJumps(cast<CompoundStmt>(Body));
BSI->TheDecl->setBody(cast<CompoundStmt>(Body)); BSI->TheDecl->setBody(cast<CompoundStmt>(Body));

4
clang/test/Index/complete-enums.cpp
View File

@ -1,6 +1,6 @@
// Note: the run lines follow their respective tests, since line/column // Note: the run lines follow their respective tests, since line/column
// matter in this test. // matter in this test.
struct X { X(); ~X(); };
enum class Color { enum class Color {
Red = 17, Red = 17,
Green, Green,
@ -9,7 +9,7 @@ enum class Color {
int Greeby(); int Greeby();
void f(Color color) { void f(Color color) {
switch (color) { switch (color) {
case Color::Green: case Color::Green: { X x; }
case Color::Red; case Color::Red;
} }
} }