diff options
| -rw-r--r-- | lib/Basic/Targets.cpp | 3 | ||||
| -rw-r--r-- | lib/Serialization/ASTWriter.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp index b8123006b8..a3cdef11ac 100644 --- a/lib/Basic/Targets.cpp +++ b/lib/Basic/Targets.cpp @@ -3055,7 +3055,8 @@ TargetInfo *TargetInfo::CreateTargetInfo(Diagnostic &Diags, Opts.Features.clear(); for (llvm::StringMap<bool>::const_iterator it = Features.begin(), ie = Features.end(); it != ie; ++it) - Opts.Features.push_back(std::string(it->second ? "+" : "-") + it->first()); + Opts.Features.push_back(std::string(it->second ? "+" : "-") + + llvm::StringRef(it->first()).str()); Target->HandleTargetFeatures(Opts.Features); return Target.take(); diff --git a/lib/Serialization/ASTWriter.cpp b/lib/Serialization/ASTWriter.cpp index 2df14937e3..a6992b142b 100644 --- a/lib/Serialization/ASTWriter.cpp +++ b/lib/Serialization/ASTWriter.cpp @@ -1174,8 +1174,8 @@ void ASTWriter::WriteStatCache(MemorizeStatCalls &StatCalls) { for (MemorizeStatCalls::iterator Stat = StatCalls.begin(), StatEnd = StatCalls.end(); Stat != StatEnd; ++Stat, ++NumStatEntries) { - const char *Filename = Stat->first(); - Generator.insert(Filename, Stat->second); + llvm::StringRef Filename = Stat->first(); + Generator.insert(Filename.data(), Stat->second); } // Create the on-disk hash table in a buffer. |