maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "Allow modifying an ImmutableMap without canonicalizing it immediately." 

Jordan and I discussed this, and we don't want this in the API.

llvm-svn: 169541
This commit is contained in:
Ted Kremenek 2012-12-06 19:41:30 +00:00
parent 8c1e667b7b
commit 625add4c46
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
llvm/include/llvm/ADT/ImmutableMap.h
View File

@ -96,40 +96,27 @@ public:
class Factory {
typename TreeTy::Factory F;
const bool Canonicalizing;
const bool Canonicalize;
public:
Factory(bool canonicalize = true)
: Canonicalizing(canonicalize) {}
: Canonicalize(canonicalize) {}
Factory(BumpPtrAllocator& Alloc, bool canonicalize = true)
: F(Alloc), Canonicalizing(canonicalize) {}
: F(Alloc), Canonicalize(canonicalize) {}
ImmutableMap getEmptyMap() { return ImmutableMap(F.getEmptyTree()); }
ImmutableMap add(ImmutableMap Old, key_type_ref K, data_type_ref D,
bool Canonicalize) {
ImmutableMap add(ImmutableMap Old, key_type_ref K, data_type_ref D) {
TreeTy *T = F.add(Old.Root, std::pair<key_type,data_type>(K,D));
return ImmutableMap(Canonicalize ? F.getCanonicalTree(T): T);
}
ImmutableMap add(ImmutableMap Old, key_type_ref K, data_type_ref D) {
return add(Old, K, D, Canonicalizing);
}
ImmutableMap remove(ImmutableMap Old, key_type_ref K, bool Canonicalize) {
ImmutableMap remove(ImmutableMap Old, key_type_ref K) {
TreeTy *T = F.remove(Old.Root,K);
return ImmutableMap(Canonicalize ? F.getCanonicalTree(T): T);
}
ImmutableMap remove(ImmutableMap Old, key_type_ref K) {
return remove(Old, K, Canonicalizing);
}
ImmutableMap getCanonicalMap(ImmutableMap Map) {
return ImmutableMap(F.getCanonicalTree(Map.Root));
}
typename TreeTy::Factory *getTreeFactory() const {
return const_cast<typename TreeTy::Factory *>(&F);
}