diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2021-12-25 22:36:56 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2022-06-04 11:59:11 +0000 |
| commit | 8a84287b0edc66fc6dede3db770d10ff41da5464 (patch) | |
| tree | bb9f1a9efd9c27bbf1594795f8e16a76a572c4e1 /contrib/llvm-project/clang/lib/Sema/CodeCompleteConsumer.cpp | |
| parent | 574b7079b96703a748f89ef5adb7dc3e26b8f7fc (diff) | |
| download | src-8a84287b0edc66fc6dede3db770d10ff41da5464.tar.gz src-8a84287b0edc66fc6dede3db770d10ff41da5464.zip | |
Merge llvm-project main llvmorg-14-init-13186-g0c553cc1af2e
This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-14-init-13186-g0c553cc1af2e.
PR: 261742
MFC after: 2 weeks
(cherry picked from commit 0eae32dcef82f6f06de6419a0d623d7def0cc8f6)
Diffstat (limited to 'contrib/llvm-project/clang/lib/Sema/CodeCompleteConsumer.cpp')
| -rw-r--r-- | contrib/llvm-project/clang/lib/Sema/CodeCompleteConsumer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/llvm-project/clang/lib/Sema/CodeCompleteConsumer.cpp b/contrib/llvm-project/clang/lib/Sema/CodeCompleteConsumer.cpp index 6c47cedfccf3..0a2ca54e244a 100644 --- a/contrib/llvm-project/clang/lib/Sema/CodeCompleteConsumer.cpp +++ b/contrib/llvm-project/clang/lib/Sema/CodeCompleteConsumer.cpp @@ -335,7 +335,7 @@ std::string CodeCompletionString::getAsString() const { break; } } - return OS.str(); + return Result; } const char *CodeCompletionString::getTypedText() const { @@ -640,7 +640,7 @@ static std::string getOverloadAsString(const CodeCompletionString &CCS) { break; } } - return OS.str(); + return Result; } void PrintingCodeCompleteConsumer::ProcessOverloadCandidates( |