simplify code.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@95074 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/ADT/ImmutableIntervalMap.h b/include/llvm/ADT/ImmutableIntervalMap.h
index 4cd7db02e96d76802b0463bedb734043149a5f7e..1ff2ae2644b6fe365293fcb04c8d46db75c7d9b1 100644 (file)
--- a/include/llvm/ADT/ImmutableIntervalMap.h
+++ b/include/llvm/ADT/ImmutableIntervalMap.h
@@ -156,28 +156,25 @@ private:
     // Current key overlaps with the inserted key.
     // Remove the current key.
     Changed = true;
-    TreeTy *OldNode = T;
+    data_type_ref OldData = ImutInfo::DataOfValue(Value(T));
     T = Remove_internal(CurrentK, T);
     // Add back the unoverlapped part of the current key.
     if (CurrentK.getStart() < K.getStart()) {
       if (CurrentK.getEnd() <= K.getEnd()) {
         Interval NewK(CurrentK.getStart(), K.getStart()-1);
-        return Add_internal(std::make_pair<key_type, data_type>(NewK, 
-                                     ImutInfo::DataOfValue(Value(OldNode))), T);
+        return Add_internal(std::make_pair(NewK, OldData), T);
       } else {
         Interval NewK1(CurrentK.getStart(), K.getStart()-1);
-        T = Add_internal(std::make_pair<key_type, data_type>(NewK1, 
-                                     ImutInfo::DataOfValue(Value(OldNode))), T);
+        T = Add_internal(std::make_pair(NewK1, OldData), T); 
+
 
         Interval NewK2(K.getEnd()+1, CurrentK.getEnd());
-        return Add_internal(std::make_pair<key_type, data_type>(NewK2,
-                                     ImutInfo::DataOfValue(Value(OldNode))), T);
+        return Add_internal(std::make_pair(NewK2, OldData), T);
       }
     } else {
       if (CurrentK.getEnd() > K.getEnd()) {
         Interval NewK(K.getEnd()+1, CurrentK.getEnd());
-        return Add_internal(std::make_pair<key_type, data_type>(NewK, 
-                                     ImutInfo::DataOfValue(Value(OldNode))), T);
+        return Add_internal(std::make_pair(NewK, OldData), T);
       }
     }
   }