[llvm-commits] [llvm] r169541 - /llvm/trunk/include/llvm/ADT/ImmutableMap.h

[Ted Kremenek]

Author: kremenek
Date: Thu Dec  6 13:41:30 2012
New Revision: 169541

URL: http://llvm.org/viewvc/llvm-project?rev=169541&view=rev
Log:
Revert "Allow modifying an ImmutableMap without canonicalizing it immediately."

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

Modified:
    llvm/trunk/include/llvm/ADT/ImmutableMap.h

Modified: llvm/trunk/include/llvm/ADT/ImmutableMap.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/ImmutableMap.h?rev=169541&r1=169540&r2=169541&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ADT/ImmutableMap.h (original)
+++ llvm/trunk/include/llvm/ADT/ImmutableMap.h Thu Dec  6 13:41:30 2012
@@ -96,40 +96,27 @@
 
   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);
     }