From d8c7a7fbaaafe37b7c4a3ade06838f342d0658ad Mon Sep 17 00:00:00 2001
From: John Criswell <criswell@uiuc.edu>
Date: Sat, 20 Dec 2003 22:37:29 +0000
Subject: Fix PR#193.

Modified ReadArchiveBuffer() so that it dynamically allocates the
std::string object used to hold the bytecode object file's name.  This is
necessary because it is passed by reference to the new Module that is
allocated to represent the bytecode object, and previously we were
using a std::string that disappeared on function exit.

llvm-svn: 10565
---
 llvm/lib/Bytecode/Reader/ArchiveReader.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'llvm/lib/Bytecode/Reader/ArchiveReader.cpp')

diff --git a/llvm/lib/Bytecode/Reader/ArchiveReader.cpp b/llvm/lib/Bytecode/Reader/ArchiveReader.cpp
index b147cb3344e..1baaff289e3 100644
--- a/llvm/lib/Bytecode/Reader/ArchiveReader.cpp
+++ b/llvm/lib/Bytecode/Reader/ArchiveReader.cpp
@@ -122,8 +122,17 @@ static bool ReadArchiveBuffer(const std::string &ArchiveName,
       while (endp[-1] == ' ')
         --endp;
     }
+
+    //
+    // We now have the beginning and the end of the object name.
+    // Convert this into a dynamically allocated std::string to pass
+    // to the routines that create the Module object.  We do this
+    // (I think) because the created Module object will outlive this function,
+    // but statically declared std::string's won't.
+    //
     std::string MemberName (startp, endp);
-    std::string FullMemberName = ArchiveName + "(" + MemberName + ")";
+    std::string * FullMemberName;
+    FullMemberName = new std::string (ArchiveName + "(" + MemberName + ")");
 
     switch (getObjectType(Hdr, MemberData, MemberSize)) {
     case SVR4LongFilename:
@@ -133,7 +142,7 @@ static bool ReadArchiveBuffer(const std::string &ArchiveName,
       break;
     case UserObject: {
       Module *M = ParseBytecodeBuffer(MemberData, MemberSize,
-                                      FullMemberName, ErrorStr);
+                                      *(FullMemberName), ErrorStr);
       if (!M) return true;
       Objects.push_back(M);
       break;
@@ -144,7 +153,7 @@ static bool ReadArchiveBuffer(const std::string &ArchiveName,
       break;
     default:
       std::cerr << "ReadArchiveBuffer: WARNING: Skipping unknown file: "
-                << FullMemberName << "\n";
+                << *(FullMemberName) << "\n";
       break;   // Just ignore unknown files.
     }
 
-- 
cgit v1.2.3