Commit 5aaaf48c authored by Chandler Carruth's avatar Chandler Carruth
Browse files

Merging r143875: 

------------------------------------------------------------------------
r143875 | chandlerc | 2011-11-06 02:51:30 -0800 (Sun, 06 Nov 2011) | 2 lines

The version objects need to actually store the version strings; they
aren't guaranteed to live long enough otherwise.
------------------------------------------------------------------------

llvm-svn: 143952
parent f1c66f59

clang/lib/Driver/ToolChains.cpp

+4 −4
Original line number Diff line number Diff line
@@ -1525,11 +1525,11 @@ static LinuxDistro DetectLinuxDistro(llvm::Triple::ArchType Arch) { 
///

/// This is the primary means of forming GCCVersion objects.

/*static*/ Linux::GCCVersion Linux::GCCVersion::Parse(StringRef VersionText) {

  const GCCVersion BadVersion = { VersionText, -1, -1, -1, "" };

  const GCCVersion BadVersion = { VersionText.str(), -1, -1, -1, "" };

  std::pair<StringRef, StringRef> First = VersionText.split('.');

  std::pair<StringRef, StringRef> Second = First.second.split('.');



  GCCVersion GoodVersion = { VersionText, -1, -1, -1, "" };

  GCCVersion GoodVersion = { VersionText.str(), -1, -1, -1, "" };

  if (First.first.getAsInteger(10, GoodVersion.Major) ||

      GoodVersion.Major < 0)

    return BadVersion;
@@ -1546,14 +1546,14 @@ static LinuxDistro DetectLinuxDistro(llvm::Triple::ArchType Arch) { 
  //   4.4.2-rc4

  //   4.4.x-patched

  // And retains any patch number it finds.

  StringRef PatchText = GoodVersion.PatchSuffix = Second.second;

  StringRef PatchText = GoodVersion.PatchSuffix = Second.second.str();

  if (!PatchText.empty()) {

    if (unsigned EndNumber = PatchText.find_first_not_of("0123456789")) {

      // Try to parse the number and any suffix.

      if (PatchText.slice(0, EndNumber).getAsInteger(10, GoodVersion.Patch) ||

          GoodVersion.Patch < 0)

        return BadVersion;

      GoodVersion.PatchSuffix = PatchText.substr(EndNumber);

      GoodVersion.PatchSuffix = PatchText.substr(EndNumber).str();

    }

  }

clang/lib/Driver/ToolChains.h

+2 −2
Original line number Diff line number Diff line
@@ -389,13 +389,13 @@ class LLVM_LIBRARY_VISIBILITY Linux : public Generic_ELF { 
  /// becomes necessary, it can be added.

  struct GCCVersion {

    /// \brief The unparsed text of the version.

    StringRef Text;

    std::string Text;



    /// \brief The parsed major, minor, and patch numbers.

    int Major, Minor, Patch;



    /// \brief Any textual suffix on the patch number.

    StringRef PatchSuffix;

    std::string PatchSuffix;



    static GCCVersion Parse(StringRef VersionText);

    bool operator<(const GCCVersion &RHS) const;