diff options
| author | Mehdi Amini <mehdi.amini@apple.com> | 2016-10-05 05:59:29 +0000 |
|---|---|---|
| committer | Mehdi Amini <mehdi.amini@apple.com> | 2016-10-05 05:59:29 +0000 |
| commit | 149f6eaed9818057b83d8f0b17bb5e8764a13143 (patch) | |
| tree | b0b1a0063de2bc0dfc3db17266a1d477be54c844 /llvm/lib/IR | |
| parent | efe40389c0e82cf173f88979c56420dfeba6b8ed (diff) | |
| download | bcm5719-llvm-149f6eaed9818057b83d8f0b17bb5e8764a13143.tar.gz bcm5719-llvm-149f6eaed9818057b83d8f0b17bb5e8764a13143.zip | |
Re-commit "Use StringRef in Support/Darf APIs (NFC)"
This reverts commit r283285 and re-commit r283275 with
a fix for format("%s", Str); where Str is a StringRef.
llvm-svn: 283298
Diffstat (limited to 'llvm/lib/IR')
| -rw-r--r-- | llvm/lib/IR/AsmWriter.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/llvm/lib/IR/AsmWriter.cpp b/llvm/lib/IR/AsmWriter.cpp index fa67425bc6c..ac7c915e839 100644 --- a/llvm/lib/IR/AsmWriter.cpp +++ b/llvm/lib/IR/AsmWriter.cpp @@ -1418,7 +1418,8 @@ struct MDFieldPrinter { void MDFieldPrinter::printTag(const DINode *N) { Out << FS << "tag: "; - if (const char *Tag = dwarf::TagString(N->getTag())) + auto Tag = dwarf::TagString(N->getTag()); + if (!Tag.empty()) Out << Tag; else Out << N->getTag(); @@ -1426,7 +1427,8 @@ void MDFieldPrinter::printTag(const DINode *N) { void MDFieldPrinter::printMacinfoType(const DIMacroNode *N) { Out << FS << "type: "; - if (const char *Type = dwarf::MacinfoString(N->getMacinfoType())) + auto Type = dwarf::MacinfoString(N->getMacinfoType()); + if (!Type.empty()) Out << Type; else Out << N->getMacinfoType(); @@ -1509,7 +1511,8 @@ void MDFieldPrinter::printDwarfEnum(StringRef Name, IntTy Value, return; Out << FS << Name << ": "; - if (const char *S = toString(Value)) + auto S = toString(Value); + if (!S.empty()) Out << S; else Out << Value; @@ -1843,8 +1846,8 @@ static void writeDIExpression(raw_ostream &Out, const DIExpression *N, FieldSeparator FS; if (N->isValid()) { for (auto I = N->expr_op_begin(), E = N->expr_op_end(); I != E; ++I) { - const char *OpStr = dwarf::OperationEncodingString(I->getOp()); - assert(OpStr && "Expected valid opcode"); + auto OpStr = dwarf::OperationEncodingString(I->getOp()); + assert(!OpStr.empty() && "Expected valid opcode"); Out << FS << OpStr; for (unsigned A = 0, AE = I->getNumArgs(); A != AE; ++A) |
