Commit b2924d99 authored by Jonas Devlieghere's avatar Jonas Devlieghere
Browse files

[llvm] Replace SmallStr.str().str() with std::string conversion operator. 

Use the std::string conversion operator introduced in
d7049213.
parent 14a16fae

llvm/lib/LTO/LTOBackend.cpp

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ void codegen(const Config &Conf, TargetMachine *TM, AddStreamFn AddStream, 


    DwoFile = Conf.DwoDir;

    sys::path::append(DwoFile, std::to_string(Task) + ".dwo");

    TM->Options.MCOptions.SplitDwarfFile = DwoFile.str().str();

    TM->Options.MCOptions.SplitDwarfFile = std::string(DwoFile);

  } else

    TM->Options.MCOptions.SplitDwarfFile = Conf.SplitDwarfFile;

llvm/lib/ProfileData/GCOV.cpp

+1 −1
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ std::string FileInfo::getCoveragePath(StringRef Filename, 
    MD5::MD5Result Result;

    Hasher.update(Filename.str());

    Hasher.final(Result);

    CoveragePath += "##" + Result.digest().str().str();

    CoveragePath += "##" + std::string(Result.digest());

  }

  CoveragePath += ".gcov";

  return CoveragePath;

llvm/lib/Support/YAMLParser.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1642,7 +1642,7 @@ bool Scanner::scanBlockScalar(bool IsLiteral) { 
  Token T;

  T.Kind = Token::TK_BlockScalar;

  T.Range = StringRef(Start, Current - Start);

  T.Value = Str.str().str();

  T.Value = std::string(Str);

  TokenQueue.push_back(T);

  return true;

}

llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static std::string findInputFile(StringRef File, ArrayRef<StringRef> Paths) { 
    SmallString<128> Path = Dir;

    sys::path::append(Path, File);

    if (sys::fs::exists(Path))

      return Path.str().str();

      return std::string(Path);

  }

  return "";

}

llvm/tools/dsymutil/SymbolMap.cpp

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ SymbolMapTranslator SymbolMapLoader::Load(StringRef InputFile, 
          StringRef UUID(CFStringGetCStringPtr(OldUUID, kCFStringEncodingUTF8));

          SmallString<256> BCSymbolMapPath(SymbolMapPath);

          sys::path::append(BCSymbolMapPath, UUID.str() + ".bcsymbolmap");

          SymbolMapPath = BCSymbolMapPath.str().str();

          SymbolMapPath = std::string(BCSymbolMapPath);

        }

        CFRelease(plist);

      }