diff options
Diffstat (limited to 'clang/lib/Basic/Diagnostic.cpp')
| -rw-r--r-- | clang/lib/Basic/Diagnostic.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Basic/Diagnostic.cpp b/clang/lib/Basic/Diagnostic.cpp index a202a55f268..35d454b1b9a 100644 --- a/clang/lib/Basic/Diagnostic.cpp +++ b/clang/lib/Basic/Diagnostic.cpp @@ -255,7 +255,8 @@ std::string DiagnosticClient::FormatDiagnostic(const DiagnosticInfo &Info) { if (Msg[i] == '%' && isdigit(Msg[i + 1])) { unsigned StrNo = Msg[i + 1] - '0'; Msg = std::string(Msg.begin(), Msg.begin() + i) + - Info.getArgStr(StrNo) + + (Info.getArgKind(StrNo) == DiagnosticInfo::ak_std_string ? + Info.getArgStdStr(StrNo) : std::string(Info.getArgCStr(StrNo))) + std::string(Msg.begin() + i + 2, Msg.end()); } } |
