summaryrefslogtreecommitdiff
path: root/lib/Support
diff options
context:
space:
mode:
authorDavid Blaikie <dblaikie@gmail.com>2014-06-19 20:08:56 +0000
committerDavid Blaikie <dblaikie@gmail.com>2014-06-19 20:08:56 +0000
commit4110a7ac7ac9f5814b6828e498efdb3e75110f66 (patch)
tree86f40c119d9305e45d66982e4abf5f834f66d421 /lib/Support
parent594f05c8dae6ec0b08694a1d439aee8bca18a47d (diff)
downloadllvm-4110a7ac7ac9f5814b6828e498efdb3e75110f66.tar.gz
llvm-4110a7ac7ac9f5814b6828e498efdb3e75110f66.tar.bz2
llvm-4110a7ac7ac9f5814b6828e498efdb3e75110f66.tar.xz
Add StringMap::insert(pair) consistent with the standard associative container concept.
Patch by Agustín Bergé. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211309 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Support')
-rw-r--r--lib/Support/StringMap.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/Support/StringMap.cpp b/lib/Support/StringMap.cpp
index 72a6d822d2..ddb73494ff 100644
--- a/lib/Support/StringMap.cpp
+++ b/lib/Support/StringMap.cpp
@@ -181,7 +181,7 @@ StringMapEntryBase *StringMapImpl::RemoveKey(StringRef Key) {
/// RehashTable - Grow the table, redistributing values into the buckets with
/// the appropriate mod-of-hashtable-size.
-void StringMapImpl::RehashTable() {
+unsigned StringMapImpl::RehashTable(unsigned BucketNo) {
unsigned NewSize;
unsigned *HashTable = (unsigned *)(TheTable + NumBuckets + 1);
@@ -193,9 +193,10 @@ void StringMapImpl::RehashTable() {
} else if (NumBuckets-(NumItems+NumTombstones) <= NumBuckets/8) {
NewSize = NumBuckets;
} else {
- return;
+ return BucketNo;
}
+ unsigned NewBucketNo = BucketNo;
// Allocate one extra bucket which will always be non-empty. This allows the
// iterators to stop at end.
StringMapEntryBase **NewTableArray =
@@ -215,6 +216,8 @@ void StringMapImpl::RehashTable() {
if (!NewTableArray[NewBucket]) {
NewTableArray[FullHash & (NewSize-1)] = Bucket;
NewHashArray[FullHash & (NewSize-1)] = FullHash;
+ if (I == BucketNo)
+ NewBucketNo = NewBucket;
continue;
}
@@ -227,6 +230,8 @@ void StringMapImpl::RehashTable() {
// Finally found a slot. Fill it in.
NewTableArray[NewBucket] = Bucket;
NewHashArray[NewBucket] = FullHash;
+ if (I == BucketNo)
+ NewBucketNo = NewBucket;
}
}
@@ -235,4 +240,5 @@ void StringMapImpl::RehashTable() {
TheTable = NewTableArray;
NumBuckets = NewSize;
NumTombstones = 0;
+ return NewBucketNo;
}