diff options
-rw-r--r-- | clang/lib/Sema/SemaOverload.cpp | 17 | ||||
-rw-r--r-- | clang/test/CodeCompletion/enable-if-attr-crash.cpp | 8 |
2 files changed, 19 insertions, 6 deletions
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp index 2c03f6977aa..ae29e7e20ae 100644 --- a/clang/lib/Sema/SemaOverload.cpp +++ b/clang/lib/Sema/SemaOverload.cpp @@ -6245,12 +6245,17 @@ convertArgsForAvailabilityChecks(Sema &S, FunctionDecl *Function, Expr *ThisArg, if (!Function->isVariadic() && Args.size() < Function->getNumParams()) { for (unsigned i = Args.size(), e = Function->getNumParams(); i != e; ++i) { ParmVarDecl *P = Function->getParamDecl(i); - ExprResult R = S.PerformCopyInitialization( - InitializedEntity::InitializeParameter(S.Context, - Function->getParamDecl(i)), - SourceLocation(), - P->hasUninstantiatedDefaultArg() ? P->getUninstantiatedDefaultArg() - : P->getDefaultArg()); + Expr *DefArg = P->hasUninstantiatedDefaultArg() + ? P->getUninstantiatedDefaultArg() + : P->getDefaultArg(); + // This can only happen in code completion, i.e. when PartialOverloading + // is true. + if (!DefArg) + return false; + ExprResult R = + S.PerformCopyInitialization(InitializedEntity::InitializeParameter( + S.Context, Function->getParamDecl(i)), + SourceLocation(), DefArg); if (R.isInvalid()) return false; ConvertedArgs.push_back(R.get()); diff --git a/clang/test/CodeCompletion/enable-if-attr-crash.cpp b/clang/test/CodeCompletion/enable-if-attr-crash.cpp new file mode 100644 index 00000000000..cca84b28ecf --- /dev/null +++ b/clang/test/CodeCompletion/enable-if-attr-crash.cpp @@ -0,0 +1,8 @@ +int foo(bool x) __attribute__((enable_if(x, ""))); + +int test() { + bool fffffff; + // RUN: %clang_cc1 -std=c++11 -code-completion-at=%s:7:8 %s | FileCheck %s + // CHECK: COMPLETION: fffffff : [#bool#]fffffff + foo(ff +} |