From 263b47b6272bfd3ea1c0e61b7ac404e7b2e0f759 Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Mon, 25 Jan 2010 16:12:32 +0000 Subject: [PATCH] Visit the condition variables of while and for loops; also, visit the condition even when we've visited the condition variable, so that we'll see implicit conversions there. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@94423 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Index/load-stmts.cpp | 52 +++++++++++++++++++++++++++++++++++++++ tools/CIndex/CIndex.cpp | 45 +++++++++++++++++++++++++++++---- 2 files changed, 92 insertions(+), 5 deletions(-) create mode 100644 test/Index/load-stmts.cpp diff --git a/test/Index/load-stmts.cpp b/test/Index/load-stmts.cpp new file mode 100644 index 0000000000..ed9ad0c338 --- /dev/null +++ b/test/Index/load-stmts.cpp @@ -0,0 +1,52 @@ +typedef int T; +struct X { int a, b; }; +void f(int x) { + for (T y = x; T z = x; ++x) { + } + if (T *z2 = &x) { } + while (T *z3 = &x) { } + switch (T z4 = x) { + case 17: break; + } +} + +// RUN: c-index-test -test-load-source all %s | FileCheck %s +// CHECK: load-stmts.cpp:3:6: UnexposedStmt=f [Extent=3:15:11:1] +// CHECK: load-stmts.cpp:3:6: UnexposedStmt=f [Extent=4:3:5:3] +// CHECK: load-stmts.cpp:3:6: UnexposedStmt=f [Extent=4:8:4:15] +// CHECK: load-stmts.cpp:4:10: VarDecl=y:4:10 (Definition) [Extent=4:8:4:14] +// CHECK: load-stmts.cpp:4:8: TypeRef=T:1:13 [Extent=4:8:4:8] +// CHECK: load-stmts.cpp:4:14: DeclRefExpr=x:3:12 [Extent=4:14:4:14] +// CHECK: load-stmts.cpp:4:19: VarDecl=z:4:19 (Definition) [Extent=4:17:4:23] +// CHECK: load-stmts.cpp:4:17: TypeRef=T:1:13 [Extent=4:17:4:17] +// CHECK: load-stmts.cpp:4:23: DeclRefExpr=x:3:12 [Extent=4:23:4:23] +// CHECK: load-stmts.cpp:4:19: UnexposedExpr=z:4:19 [Extent=4:19:4:19] +// CHECK: load-stmts.cpp:4:19: DeclRefExpr=z:4:19 [Extent=4:19:4:19] +// CHECK: load-stmts.cpp:4:26: UnexposedExpr= [Extent=4:26:4:28] +// CHECK: load-stmts.cpp:4:28: DeclRefExpr=x:3:12 [Extent=4:28:4:28] +// CHECK: load-stmts.cpp:4:19: UnexposedStmt=z [Extent=4:31:5:3] +// CHECK: load-stmts.cpp:4:19: UnexposedStmt=z [Extent=6:3:6:21] +// CHECK: load-stmts.cpp:6:10: VarDecl=z2:6:10 (Definition) [Extent=6:7:6:16] +// CHECK: load-stmts.cpp:6:7: TypeRef=T:1:13 [Extent=6:7:6:7] +// CHECK: load-stmts.cpp:6:15: UnexposedExpr= [Extent=6:15:6:16] +// CHECK: load-stmts.cpp:6:16: DeclRefExpr=x:3:12 [Extent=6:16:6:16] +// CHECK: load-stmts.cpp:6:10: UnexposedExpr=z2:6:10 [Extent=6:10:6:11] +// CHECK: load-stmts.cpp:6:10: DeclRefExpr=z2:6:10 [Extent=6:10:6:11] +// CHECK: load-stmts.cpp:6:10: UnexposedStmt=z2 [Extent=6:19:6:21] +// CHECK: load-stmts.cpp:6:10: UnexposedStmt=z2 [Extent=7:3:7:24] +// CHECK: load-stmts.cpp:7:13: VarDecl=z3:7:13 (Definition) [Extent=7:10:7:19] +// CHECK: load-stmts.cpp:7:10: TypeRef=T:1:13 [Extent=7:10:7:10] +// CHECK: load-stmts.cpp:7:18: UnexposedExpr= [Extent=7:18:7:19] +// CHECK: load-stmts.cpp:7:19: DeclRefExpr=x:3:12 [Extent=7:19:7:19] +// CHECK: load-stmts.cpp:7:13: UnexposedExpr=z3:7:13 [Extent=7:13:7:14] +// CHECK: load-stmts.cpp:7:13: DeclRefExpr=z3:7:13 [Extent=7:13:7:14] +// CHECK: load-stmts.cpp:7:13: UnexposedStmt=z3 [Extent=7:22:7:24] +// CHECK: load-stmts.cpp:7:13: UnexposedStmt=z3 [Extent=8:3:10:3] +// CHECK: load-stmts.cpp:8:13: VarDecl=z4:8:13 (Definition) [Extent=8:11:8:18] +// CHECK: load-stmts.cpp:8:11: TypeRef=T:1:13 [Extent=8:11:8:11] +// CHECK: load-stmts.cpp:8:18: DeclRefExpr=x:3:12 [Extent=8:18:8:18] +// CHECK: load-stmts.cpp:8:13: DeclRefExpr=z4:8:13 [Extent=8:13:8:14] +// CHECK: load-stmts.cpp:8:13: UnexposedStmt=z4 [Extent=8:21:10:3] +// CHECK: load-stmts.cpp:8:13: UnexposedStmt=z4 [Extent=9:3:9:16] +// CHECK: load-stmts.cpp:8:13: UnexposedStmt=z4 [Extent=9:12:9:16] +// CHECK: load-stmts.cpp:9:8: UnexposedExpr= [Extent=9:8:9:9] diff --git a/tools/CIndex/CIndex.cpp b/tools/CIndex/CIndex.cpp index 4436709f80..c9c6c25d58 100644 --- a/tools/CIndex/CIndex.cpp +++ b/tools/CIndex/CIndex.cpp @@ -292,6 +292,8 @@ public: // FIXME: LabelStmt label? bool VisitIfStmt(IfStmt *S); bool VisitSwitchStmt(SwitchStmt *S); + bool VisitWhileStmt(WhileStmt *S); + bool VisitForStmt(ForStmt *S); // Expression visitors bool VisitSizeOfAlignOfExpr(SizeOfAlignOfExpr *E); @@ -793,7 +795,7 @@ bool CursorVisitor::VisitStmt(Stmt *S) { bool CursorVisitor::VisitDeclStmt(DeclStmt *S) { for (DeclStmt::decl_iterator D = S->decl_begin(), DEnd = S->decl_end(); D != DEnd; ++D) { - if (Visit(MakeCXCursor(*D, TU))) + if (*D && Visit(MakeCXCursor(*D, TU))) return true; } @@ -804,12 +806,12 @@ bool CursorVisitor::VisitIfStmt(IfStmt *S) { if (VarDecl *Var = S->getConditionVariable()) { if (Visit(MakeCXCursor(Var, TU))) return true; - } else if (S->getCond() && Visit(MakeCXCursor(S->getCond(), StmtParent, TU))) - return true; + } + if (S->getCond() && Visit(MakeCXCursor(S->getCond(), StmtParent, TU))) + return true; if (S->getThen() && Visit(MakeCXCursor(S->getThen(), StmtParent, TU))) return true; - if (S->getElse() && Visit(MakeCXCursor(S->getElse(), StmtParent, TU))) return true; @@ -820,9 +822,42 @@ bool CursorVisitor::VisitSwitchStmt(SwitchStmt *S) { if (VarDecl *Var = S->getConditionVariable()) { if (Visit(MakeCXCursor(Var, TU))) return true; - } else if (S->getCond() && Visit(MakeCXCursor(S->getCond(), StmtParent, TU))) + } + + if (S->getCond() && Visit(MakeCXCursor(S->getCond(), StmtParent, TU))) return true; + if (S->getBody() && Visit(MakeCXCursor(S->getBody(), StmtParent, TU))) + return true; + + return false; +} +bool CursorVisitor::VisitWhileStmt(WhileStmt *S) { + if (VarDecl *Var = S->getConditionVariable()) { + if (Visit(MakeCXCursor(Var, TU))) + return true; + } + + if (S->getCond() && Visit(MakeCXCursor(S->getCond(), StmtParent, TU))) + return true; + if (S->getBody() && Visit(MakeCXCursor(S->getBody(), StmtParent, TU))) + return true; + + return false; +} + +bool CursorVisitor::VisitForStmt(ForStmt *S) { + if (S->getInit() && Visit(MakeCXCursor(S->getInit(), StmtParent, TU))) + return true; + if (VarDecl *Var = S->getConditionVariable()) { + if (Visit(MakeCXCursor(Var, TU))) + return true; + } + + if (S->getCond() && Visit(MakeCXCursor(S->getCond(), StmtParent, TU))) + return true; + if (S->getInc() && Visit(MakeCXCursor(S->getInc(), StmtParent, TU))) + return true; if (S->getBody() && Visit(MakeCXCursor(S->getBody(), StmtParent, TU))) return true; -- 2.40.0