diff options
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/AST/ASTDiagnostic.cpp | 23 | ||||
| -rw-r--r-- | clang/lib/Basic/Diagnostic.cpp | 19 | ||||
| -rw-r--r-- | clang/lib/CodeGen/CGExpr.cpp | 2 |
3 files changed, 20 insertions, 24 deletions
diff --git a/clang/lib/AST/ASTDiagnostic.cpp b/clang/lib/AST/ASTDiagnostic.cpp index a9d8cbf17d9..dbc7ace5e20 100644 --- a/clang/lib/AST/ASTDiagnostic.cpp +++ b/clang/lib/AST/ASTDiagnostic.cpp @@ -256,10 +256,8 @@ static bool FormatTemplateTypeDiff(ASTContext &Context, QualType FromType, void clang::FormatASTNodeDiagnosticArgument( DiagnosticsEngine::ArgumentKind Kind, intptr_t Val, - const char *Modifier, - unsigned ModLen, - const char *Argument, - unsigned ArgLen, + StringRef Modifier, + StringRef Argument, ArrayRef<DiagnosticsEngine::ArgumentValue> PrevArgs, SmallVectorImpl<char> &Output, void *Cookie, @@ -295,12 +293,12 @@ void clang::FormatASTNodeDiagnosticArgument( // Attempting to do a template diff on non-templates. Set the variables // and continue with regular type printing of the appropriate type. Val = TDT.PrintFromType ? TDT.FromType : TDT.ToType; - ModLen = 0; - ArgLen = 0; + Modifier = StringRef(); + Argument = StringRef(); // Fall through } case DiagnosticsEngine::ak_qualtype: { - assert(ModLen == 0 && ArgLen == 0 && + assert(Modifier.empty() && Argument.empty() && "Invalid modifier for QualType argument"); QualType Ty(QualType::getFromOpaquePtr(reinterpret_cast<void*>(Val))); @@ -309,13 +307,12 @@ void clang::FormatASTNodeDiagnosticArgument( break; } case DiagnosticsEngine::ak_declarationname: { - if (ModLen == 9 && !memcmp(Modifier, "objcclass", 9) && ArgLen == 0) + if (Modifier == "objcclass" && Argument.empty()) OS << '+'; - else if (ModLen == 12 && !memcmp(Modifier, "objcinstance", 12) - && ArgLen==0) + else if (Modifier == "objcinstance" && Argument.empty()) OS << '-'; else - assert(ModLen == 0 && ArgLen == 0 && + assert(Modifier.empty() && Argument.empty() && "Invalid modifier for DeclarationName argument"); OS << DeclarationName::getFromOpaqueInteger(Val); @@ -323,10 +320,10 @@ void clang::FormatASTNodeDiagnosticArgument( } case DiagnosticsEngine::ak_nameddecl: { bool Qualified; - if (ModLen == 1 && Modifier[0] == 'q' && ArgLen == 0) + if (Modifier == "q" && Argument.empty()) Qualified = true; else { - assert(ModLen == 0 && ArgLen == 0 && + assert(Modifier.empty() && Argument.empty() && "Invalid modifier for NamedDecl* argument"); Qualified = false; } diff --git a/clang/lib/Basic/Diagnostic.cpp b/clang/lib/Basic/Diagnostic.cpp index 19561337035..97299611f0d 100644 --- a/clang/lib/Basic/Diagnostic.cpp +++ b/clang/lib/Basic/Diagnostic.cpp @@ -24,8 +24,7 @@ using namespace clang; static void DummyArgToStringFn(DiagnosticsEngine::ArgumentKind AK, intptr_t QT, - const char *Modifier, unsigned ML, - const char *Argument, unsigned ArgLen, + StringRef Modifier, StringRef Argument, ArrayRef<DiagnosticsEngine::ArgumentValue> PrevArgs, SmallVectorImpl<char> &Output, void *Cookie, @@ -827,8 +826,8 @@ FormatDiagnostic(const char *DiagStr, const char *DiagEnd, case DiagnosticsEngine::ak_declcontext: case DiagnosticsEngine::ak_attr: getDiags()->ConvertArgToString(Kind, getRawArg(ArgNo), - Modifier, ModifierLen, - Argument, ArgumentLen, + StringRef(Modifier, ModifierLen), + StringRef(Argument, ArgumentLen), FormattedArgs, OutStr, QualTypeVals); break; @@ -851,8 +850,8 @@ FormatDiagnostic(const char *DiagStr, const char *DiagEnd, TDT.PrintFromType = true; TDT.PrintTree = true; getDiags()->ConvertArgToString(Kind, val, - Modifier, ModifierLen, - Argument, ArgumentLen, + StringRef(Modifier, ModifierLen), + StringRef(Argument, ArgumentLen), FormattedArgs, Tree, QualTypeVals); // If there is no tree information, fall back to regular printing. @@ -874,8 +873,8 @@ FormatDiagnostic(const char *DiagStr, const char *DiagEnd, TDT.PrintTree = false; TDT.PrintFromType = true; getDiags()->ConvertArgToString(Kind, val, - Modifier, ModifierLen, - Argument, ArgumentLen, + StringRef(Modifier, ModifierLen), + StringRef(Argument, ArgumentLen), FormattedArgs, OutStr, QualTypeVals); if (!TDT.TemplateDiffUsed) @@ -888,8 +887,8 @@ FormatDiagnostic(const char *DiagStr, const char *DiagEnd, // Append second type TDT.PrintFromType = false; getDiags()->ConvertArgToString(Kind, val, - Modifier, ModifierLen, - Argument, ArgumentLen, + StringRef(Modifier, ModifierLen), + StringRef(Argument, ArgumentLen), FormattedArgs, OutStr, QualTypeVals); if (!TDT.TemplateDiffUsed) diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp index 4c3d0f40662..fda04104b6c 100644 --- a/clang/lib/CodeGen/CGExpr.cpp +++ b/clang/lib/CodeGen/CGExpr.cpp @@ -2101,7 +2101,7 @@ llvm::Constant *CodeGenFunction::EmitCheckTypeDescriptor(QualType T) { SmallString<32> Buffer; CGM.getDiags().ConvertArgToString(DiagnosticsEngine::ak_qualtype, (intptr_t)T.getAsOpaquePtr(), - nullptr, 0, nullptr, 0, None, Buffer, + StringRef(), StringRef(), None, Buffer, ArrayRef<intptr_t>()); llvm::Constant *Components[] = { |
