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

fix a pretty serious bug in StringMap where GetOrCreate(strstart,strend, z)

Browse Source 
would not set new values to Z.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@63707 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2009-02-04 01:54:10 +00:00
parent e20e790074
commit 4715f6395e
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/llvm/ADT/StringMap.h
View File

@ -34,6 +34,7 @@ class StringMapEntryInitializer {
public:
template <typename InitTy>
static void Initialize(StringMapEntry<ValueTy> &T, InitTy InitVal) {
T.second = InitVal;
}
};
@ -195,7 +196,7 @@ public:
}
static StringMapEntry *Create(const char *KeyStart, const char *KeyEnd) {
return Create(KeyStart, KeyEnd, 0);
return Create(KeyStart, KeyEnd, ValueTy());
}
/// GetStringMapEntryFromValue - Given a value that is known to be embedded
@ -240,6 +241,17 @@ public:
StringMap() : StringMapImpl(static_cast<unsigned>(sizeof(MapEntryTy))) {}
explicit StringMap(unsigned InitialSize)
: StringMapImpl(InitialSize, static_cast<unsigned>(sizeof(MapEntryTy))) {}
explicit StringMap(const StringMap &RHS)
: StringMapImpl(static_cast<unsigned>(sizeof(MapEntryTy))) {
assert(RHS.empty() &&
"Copy ctor from non-empty stringmap not implemented yet!");
}
void operator=(const StringMap &RHS) {
assert(RHS.empty() &&
"assignment from non-empty stringmap not implemented yet!");
clear();
}
AllocatorTy &getAllocator() { return Allocator; }
const AllocatorTy &getAllocator() const { return Allocator; }
@ -292,13 +304,11 @@ public:
}
ValueTy& operator[](const char *Key) {
value_type& entry = GetOrCreateValue(Key, Key + strlen(Key));
return entry.getValue();
return GetOrCreateValue(Key, Key + strlen(Key)).getValue();
}
ValueTy& operator[](const std::string &Key) {
const char* key_start = (Key.empty() ? NULL : &Key[0]);
value_type& entry = GetOrCreateValue(key_start, key_start + Key.size());
return entry.getValue();
return GetOrCreateValue(key_start, key_start + Key.size()).getValue();
}
size_type count(const char *KeyStart, const char *KeyEnd) const {
@ -378,7 +388,7 @@ public:
StringMapEntry<ValueTy> &GetOrCreateValue(const char *KeyStart,
const char *KeyEnd) {
return GetOrCreateValue(KeyStart, KeyEnd, 0);
return GetOrCreateValue(KeyStart, KeyEnd, ValueTy());
}
/// remove - Remove the specified key/value pair from the map, but do not
@ -411,9 +421,6 @@ public:
clear();
free(TheTable);
}
private:
StringMap(const StringMap &); // FIXME: Implement.
void operator=(const StringMap &); // FIXME: Implement.
};