diff options
| -rw-r--r-- | clang/lib/Sema/SemaCodeComplete.cpp | 8 | ||||
| -rw-r--r-- | clang/test/Index/complete-constructor-params.cpp | 14 |
2 files changed, 21 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaCodeComplete.cpp b/clang/lib/Sema/SemaCodeComplete.cpp index 80238e5edbc..eeeb8511b21 100644 --- a/clang/lib/Sema/SemaCodeComplete.cpp +++ b/clang/lib/Sema/SemaCodeComplete.cpp @@ -4035,12 +4035,18 @@ void Sema::CodeCompleteConstructor(Scope *S, QualType Type, SourceLocation Loc, if (RequireCompleteType(Loc, Type, 0)) return; + CXXRecordDecl *RD = Type->getAsCXXRecordDecl(); + if (!RD) { + CodeCompleteExpression(S, Type); + return; + } + // FIXME: Provide support for member initializers. // FIXME: Provide support for variadic template constructors. OverloadCandidateSet CandidateSet(Loc, OverloadCandidateSet::CSK_Normal); - for (auto C : LookupConstructors(Type->getAsCXXRecordDecl())) { + for (auto C : LookupConstructors(RD)) { if (auto FD = dyn_cast<FunctionDecl>(C)) { AddOverloadCandidate(FD, DeclAccessPair::make(FD, C->getAccess()), Args, CandidateSet, diff --git a/clang/test/Index/complete-constructor-params.cpp b/clang/test/Index/complete-constructor-params.cpp index e5c01df87bd..6685626a587 100644 --- a/clang/test/Index/complete-constructor-params.cpp +++ b/clang/test/Index/complete-constructor-params.cpp @@ -14,6 +14,8 @@ int main() { S<int>(42, 42, 42,); S<int> z(42, 42, 42,); + + int(42); } // RUN: c-index-test -code-completion-at=%s:11:10 %s | FileCheck -check-prefix=CHECK-CC1 %s @@ -124,3 +126,15 @@ int main() { // CHECK-CC9-NEXT: Class name // CHECK-CC9-NEXT: Nested name specifier // CHECK-CC9-NEXT: Objective-C interface + +// RUN: c-index-test -code-completion-at=%s:18:7 %s | FileCheck -check-prefix=CHECK-CC10 %s +// CHECK-CC10: FunctionDecl:{ResultType int}{TypedText main}{LeftParen (}{RightParen )} (12) +// CHECK-CC10: Completion contexts: +// CHECK-CC10-NEXT: Any type +// CHECK-CC10-NEXT: Any value +// CHECK-CC10-NEXT: Enum tag +// CHECK-CC10-NEXT: Union tag +// CHECK-CC10-NEXT: Struct tag +// CHECK-CC10-NEXT: Class name +// CHECK-CC10-NEXT: Nested name specifier +// CHECK-CC10-NEXT: Objective-C interface |
