From 6f7008dcb6b4668f38a018df9cace7642b647be9 Mon Sep 17 00:00:00 2001 From: Ted Kremenek Date: Tue, 15 Mar 2011 23:47:49 +0000 Subject: [PATCH] c-index-test shouldn't crash when a goto has no matching label. Fixes . llvm-svn: 127711 --- clang/test/Index/cindex-on-invalid.m | 9 ++++++++- clang/tools/libclang/CIndex.cpp | 4 +++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/clang/test/Index/cindex-on-invalid.m b/clang/test/Index/cindex-on-invalid.m index d2d952d8b19e..d223c2ad590e 100644 --- a/clang/test/Index/cindex-on-invalid.m +++ b/clang/test/Index/cindex-on-invalid.m @@ -1,6 +1,13 @@ // RUN: c-index-test -test-load-source local %s 2>&1 | FileCheck %s +// +void test() { + goto exit; +} + int foo; int -// CHECK: cindex-on-invalid.m:6:70: error: expected identifier or '(' \ No newline at end of file +// CHECK: cindex-on-invalid.m:5:8: error: use of undeclared label 'exit' +// CHECK: cindex-on-invalid.m:13:1: error: expected identifier or '(' + diff --git a/clang/tools/libclang/CIndex.cpp b/clang/tools/libclang/CIndex.cpp index 290146fa4dd1..538efd7ae380 100644 --- a/clang/tools/libclang/CIndex.cpp +++ b/clang/tools/libclang/CIndex.cpp @@ -3709,7 +3709,9 @@ CXCursor clang_getCursorReferenced(CXCursor C) { if (clang_isStatement(C.kind)) { Stmt *S = getCursorStmt(C); if (GotoStmt *Goto = dyn_cast_or_null(S)) - return MakeCXCursor(Goto->getLabel()->getStmt(), getCursorDecl(C), tu); + if (LabelDecl *label = Goto->getLabel()) + if (LabelStmt *labelS = label->getStmt()) + return MakeCXCursor(labelS, getCursorDecl(C), tu); return clang_getNullCursor(); }