This is an archive of the discontinued LLVM Phabricator instance.

Differential D35682

Fixed failing assert in code completion.
ClosedPublic

Authored by ilya-biryukov on Jul 20 2017, 6:35 AM.

Details

Reviewers
erikjv
klimek
bkramer
krasimir
Commits
rGdda69b2e87bd: Merging r308722: --------------------------------------------------------------…
rGb6d1ec807367: Fixed failing assert in code completion.
rC308722: Fixed failing assert in code completion.
rL310395: Merging r308722:
rL308722: Fixed failing assert in code completion.
Summary

The code was accessing uninstantiated default argument.
This resulted in failing assertion at ParamVarDecl::getDefaultArg().

Diff Detail

Repository
rL LLVM

Event Timeline

ilya-biryukov created this revision.Jul 20 2017, 6:35 AM
Harbormaster completed remote builds in B8431: Diff 107500.Jul 20 2017, 6:36 AM
krasimir accepted this revision.Jul 21 2017, 1:49 AM

Looks good!

This revision is now accepted and ready to land.Jul 21 2017, 1:49 AM
Closed by commit rL308722: Fixed failing assert in code completion. (authored by ibiryukov). · Explain WhyJul 21 2017, 2:24 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
cfe/
trunk/
lib/
Sema/
5 lines
test/
CodeCompletion/
13 lines

Diff 107644

cfe/trunk/lib/Sema/SemaCodeComplete.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 2,395 Lines • ▼ Show 20 LinesformatBlockPlaceholder(const PrintingPolicy &Policy, const NamedDecl *BlockDecl,
} }
return Result; return Result;
} }
static std::string GetDefaultValueString(const ParmVarDecl *Param, static std::string GetDefaultValueString(const ParmVarDecl *Param,
const SourceManager &SM, const SourceManager &SM,
const LangOptions &LangOpts) { const LangOptions &LangOpts) {
const Expr *defaultArg = Param->getDefaultArg(); const SourceRange SrcRange = Param->getDefaultArgRange();
if (!defaultArg)
return "";
const SourceRange SrcRange = defaultArg->getSourceRange();
CharSourceRange CharSrcRange = CharSourceRange::getTokenRange(SrcRange); CharSourceRange CharSrcRange = CharSourceRange::getTokenRange(SrcRange);
bool Invalid = CharSrcRange.isInvalid(); bool Invalid = CharSrcRange.isInvalid();
if (Invalid) if (Invalid)
return ""; return "";
StringRef srcText = Lexer::getSourceText(CharSrcRange, SM, LangOpts, &Invalid); StringRef srcText = Lexer::getSourceText(CharSrcRange, SM, LangOpts, &Invalid);
if (Invalid) if (Invalid)
return ""; return "";
▲ Show 20 Lines • Show All 5,495 Lines • Show Last 20 Lines

cfe/trunk/test/CodeCompletion/uninstantiated_params.cpp

template <class T>
struct unique_ptr {
typedef T* pointer;
void reset(pointer ptr = pointer());
};
void test() {
unique_ptr<int> x;
x.
// RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:10:5 %s -o - | FileCheck -check-prefix=CHECK-CC1 %s
// CHECK-CC1: [#void#]reset({#<#unique_ptr<int>::pointer ptr = pointer()#>#})
}