6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-14 11:32:34 +00:00
Code Issues Projects Releases Wiki Activity

Reverted back to revision 1.11. The previous fix doesn't really fix

Browse Source 
anything; it just causes the bug to go dormant.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10585 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
John Criswell 2003-12-22 16:22:49 +00:00
parent 056063e264
commit 9059158b56
3 changed files with 9 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Archive/ArchiveReader.cpp
View File

@ -122,17 +122,8 @@ 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;
FullMemberName = new std::string (ArchiveName + "(" + MemberName + ")");
std::string FullMemberName = ArchiveName + "(" + MemberName + ")";
switch (getObjectType(Hdr, MemberData, MemberSize)) {
case SVR4LongFilename:
@ -142,7 +133,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;
@ -153,7 +144,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.
}

15
lib/Bytecode/Archive/ArchiveReader.cpp
View File

@ -122,17 +122,8 @@ 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;
FullMemberName = new std::string (ArchiveName + "(" + MemberName + ")");
std::string FullMemberName = ArchiveName + "(" + MemberName + ")";
switch (getObjectType(Hdr, MemberData, MemberSize)) {
case SVR4LongFilename:
@ -142,7 +133,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;
@ -153,7 +144,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.
}

15
lib/Bytecode/Reader/ArchiveReader.cpp
View File

@ -122,17 +122,8 @@ 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;
FullMemberName = new std::string (ArchiveName + "(" + MemberName + ")");
std::string FullMemberName = ArchiveName + "(" + MemberName + ")";
switch (getObjectType(Hdr, MemberData, MemberSize)) {
case SVR4LongFilename:
@ -142,7 +133,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;
@ -153,7 +144,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.
}