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

Revert "[Option] Store arg strings in a set backed by a BumpPtrAllocator"

Browse Source 
This broke clang's crash-report.c test, and I haven't been able to
figure it out yet.

This reverts commit r186319.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@186329 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Kleckner 2013-07-15 16:40:52 +00:00
parent 0bf3c99886
commit f73f809756
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/llvm/Option/ArgList.h
View File

@ -12,10 +12,9 @@
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/StringSet.h"
#include "llvm/Option/OptSpecifier.h"
#include "llvm/Option/Option.h"
#include "llvm/Support/Allocator.h"
#include <list>
#include <string>
#include <vector>
@ -299,7 +298,7 @@ private:
/// This is mutable since we treat the ArgList as being the list
/// of Args, and allow routines to add new strings (to have a
/// convenient place to store the memory) via MakeIndex.
mutable StringSet<BumpPtrAllocator> SynthesizedStrings;
mutable std::list<std::string> SynthesizedStrings;
/// The number of original input argument strings.
unsigned NumInputArgStrings;

13
lib/Option/ArgList.cpp
View File

@ -323,18 +323,9 @@ InputArgList::~InputArgList() {
unsigned InputArgList::MakeIndex(StringRef String0) const {
unsigned Index = ArgStrings.size();
// If necessary, make a copy so we can null terminate it.
std::string NullTerminated;
if (String0.back() != '\0') {
NullTerminated.append(String0.data(), String0.size());
NullTerminated.push_back('\0');
String0 = StringRef(&NullTerminated[0], NullTerminated.size());
}
// Tuck away so we have a reliable const char *.
String0 = SynthesizedStrings.GetOrCreateValue(String0).getKey();
assert(String0.back() == '\0');
ArgStrings.push_back(String0.data());
SynthesizedStrings.push_back(String0);
ArgStrings.push_back(SynthesizedStrings.back().c_str());
return Index;
}