Replace pointer arithmetic with StringRef::substr.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@117477 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/MC/ELFObjectWriter.cpp b/lib/MC/ELFObjectWriter.cpp
index 1904397fe11f5c6a8edb9874357d17971b49e357..addda8a02b0a406648f3dd82d386843f8dd70aa4 100644 (file)
--- a/lib/MC/ELFObjectWriter.cpp
+++ b/lib/MC/ELFObjectWriter.cpp
@@ -459,12 +459,12 @@ void ELFObjectWriterImpl::ExecutePostLayoutBinding(MCAssembler &Asm) {
     if (!Alias.isVariable())
       continue;
     const MCSymbol &Symbol = AliasedSymbol(Alias);
-    const StringRef &AliasName = Alias.getName();
+    StringRef AliasName = Alias.getName();
     size_t Pos = AliasName.find('@');
     if (Pos == StringRef::npos)
       continue;
 
-    StringRef Rest(AliasName.begin() + Pos);
+    StringRef Rest = AliasName.substr(Pos);
     if (!Symbol.isUndefined() && !Rest.startswith("@@@"))
       continue;
 
@@ -473,8 +473,7 @@ void ELFObjectWriterImpl::ExecutePostLayoutBinding(MCAssembler &Asm) {
         !Rest.startswith("@@@"))
       report_fatal_error("A @@ version cannot be undefined");
 
-    std::pair<const MCSymbol *, const MCSymbol *> t(&Symbol, &Alias);
-    Renames.insert(t);
+    Renames.insert(std::make_pair(&Symbol, &Alias));
   }
 }
 
@@ -887,9 +886,9 @@ void ELFObjectWriterImpl::ComputeSymbolTable(MCAssembler &Asm) {
     size_t Pos = Name.find("@@@");
     std::string FinalName;
     if (Pos != StringRef::npos) {
-      StringRef Prefix(Name.begin(), Pos);
+      StringRef Prefix = Name.substr(0, Pos);
       unsigned n = MSD.SectionIndex == ELF::SHN_UNDEF ? 2 : 1;
-      StringRef Suffix(Name.begin() + Pos + n);
+      StringRef Suffix = Name.substr(Pos + n);
       FinalName = Prefix.str() + Suffix.str();
     } else {
       FinalName = Name.str();