X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FADT%2FIndexedMap.h;h=ff5d3a139c705e793d53460213d2061757774ae3;hb=83b5752747ea14696b0e51904722c38771f22eb7;hp=5fcdfae9dea71235f54e14e1b8ecc9fee3cda8ac;hpb=4d0d864be3d9a698c4edfe36961a22126f041298;p=oota-llvm.git

diff --git a/include/llvm/ADT/IndexedMap.h b/include/llvm/ADT/IndexedMap.h
index 5fcdfae9dea..ff5d3a139c7 100644
--- a/include/llvm/ADT/IndexedMap.h
+++ b/include/llvm/ADT/IndexedMap.h
@@ -1,15 +1,15 @@
-//===- DenseMap.h - A dense map implmentation -------------------*- C++ -*-===//
-// 
+//===- llvm/ADT/IndexedMap.h - An index map implementation ------*- C++ -*-===//
+//
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
 //===----------------------------------------------------------------------===//
 //
-// This file implements a dense map. A dense map template takes two
+// This file implements an indexed map. The index map template takes two
 // types. The first is the mapped type and the second is a functor
-// that maps its argument to a size_t. On instanciation a "null" value
+// that maps its argument to a size_t. On instantiation a "null" value
 // can be provided to be used as a "does not exist" indicator in the
 // map. A member function grow() is provided that given the value of
 // the maximally indexed key (the argument of the functor) makes sure
@@ -17,44 +17,58 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_DENSEMAP_H
-#define SUPPORT_DENSEMAP_H
+#ifndef LLVM_ADT_INDEXEDMAP_H
+#define LLVM_ADT_INDEXEDMAP_H
 
+#include <cassert>
+#include <functional>
 #include <vector>
 
 namespace llvm {
 
-template <typename T, typename ToIndexT>
-class DenseMap {
+  struct IdentityFunctor : std::unary_function<unsigned, unsigned> {
+    unsigned operator()(unsigned Index) const {
+      return Index;
+    }
+  };
+
+  template <typename T, typename ToIndexT = IdentityFunctor>
+  class IndexedMap {
     typedef typename ToIndexT::argument_type IndexT;
     typedef std::vector<T> StorageT;
     StorageT storage_;
     T nullVal_;
     ToIndexT toIndex_;
 
-public:
-    DenseMap() { }
+  public:
+    IndexedMap() : nullVal_(T()) { }
 
-    explicit DenseMap(const T& val) : nullVal_(val) { }
+    explicit IndexedMap(const T& val) : nullVal_(val) { }
 
     typename StorageT::reference operator[](IndexT n) {
-        assert(toIndex_(n) < storage_.size() && "index out of bounds!");
-        return storage_[toIndex_(n)];
+      assert(toIndex_(n) < storage_.size() && "index out of bounds!");
+      return storage_[toIndex_(n)];
     }
 
     typename StorageT::const_reference operator[](IndexT n) const {
-        assert(toIndex_(n) < storage_.size() && "index out of bounds!");
-        return storage_[toIndex_(n)];
+      assert(toIndex_(n) < storage_.size() && "index out of bounds!");
+      return storage_[toIndex_(n)];
     }
 
     void clear() {
-        storage_.assign(storage_.size(), nullVal_);
+      storage_.clear();
     }
 
     void grow(IndexT n) {
-        storage_.resize(toIndex_(n) + 1, nullVal_);
+      unsigned NewSize = toIndex_(n) + 1;
+      if (NewSize > storage_.size())
+        storage_.resize(NewSize, nullVal_);
+    }
+
+    typename StorageT::size_type size() const {
+      return storage_.size();
     }
-};
+  };
 
 } // End llvm namespace