projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bring TinyPtrVector under test. Somehow we never picked up unit tests
[oota-llvm.git]
/
include
/
llvm
/
ADT
/
TinyPtrVector.h
diff --git
a/include/llvm/ADT/TinyPtrVector.h
b/include/llvm/ADT/TinyPtrVector.h
index 362f2961ec306ce1ab2fed4145664748608a7316..ca624c6c5412bc0f047b044a61720bb641a2b6f1 100644
(file)
--- a/
include/llvm/ADT/TinyPtrVector.h
+++ b/
include/llvm/ADT/TinyPtrVector.h
@@
-10,8
+10,10
@@
#ifndef LLVM_ADT_TINYPTRVECTOR_H
#define LLVM_ADT_TINYPTRVECTOR_H
#ifndef LLVM_ADT_TINYPTRVECTOR_H
#define LLVM_ADT_TINYPTRVECTOR_H
+#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/PointerUnion.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/PointerUnion.h"
+#include "llvm/Support/Compiler.h"
namespace llvm {
namespace llvm {
@@
-25,6
+27,8
@@
template <typename EltTy>
class TinyPtrVector {
public:
typedef llvm::SmallVector<EltTy, 4> VecTy;
class TinyPtrVector {
public:
typedef llvm::SmallVector<EltTy, 4> VecTy;
+ typedef typename VecTy::value_type value_type;
+
llvm::PointerUnion<EltTy, VecTy*> Val;
TinyPtrVector() {}
llvm::PointerUnion<EltTy, VecTy*> Val;
TinyPtrVector() {}
@@
-32,6
+36,11
@@
public:
if (VecTy *V = Val.template dyn_cast<VecTy*>())
Val = new VecTy(*V);
}
if (VecTy *V = Val.template dyn_cast<VecTy*>())
Val = new VecTy(*V);
}
+#if LLVM_USE_RVALUE_REFERENCES
+ TinyPtrVector(TinyPtrVector &&RHS) : Val(RHS.Val) {
+ RHS.Val = (EltTy)0;
+ }
+#endif
~TinyPtrVector() {
if (VecTy *V = Val.template dyn_cast<VecTy*>())
delete V;
~TinyPtrVector() {
if (VecTy *V = Val.template dyn_cast<VecTy*>())
delete V;
@@
-42,7
+51,7
@@
public:
if (Val.isNull())
return ArrayRef<EltTy>();
if (Val.template is<EltTy>())
if (Val.isNull())
return ArrayRef<EltTy>();
if (Val.template is<EltTy>())
- return *Val.
template getAddrOf<EltTy>
();
+ return *Val.
getAddrOfPtr1
();
return *Val.template get<VecTy*>();
}
return *Val.template get<VecTy*>();
}
@@
-63,13
+72,10
@@
public:
return Val.template get<VecTy*>()->size();
}
return Val.template get<VecTy*>()->size();
}
- typedef const EltTy *const
const
_iterator;
+ typedef const EltTy *const_iterator;
typedef EltTy *iterator;
iterator begin() {
typedef EltTy *iterator;
iterator begin() {
- if (empty())
- return 0;
-
if (Val.template is<EltTy>())
return Val.getAddrOfPtr1();
if (Val.template is<EltTy>())
return Val.getAddrOfPtr1();
@@
-77,11
+83,8
@@
public:
}
iterator end() {
}
iterator end() {
- if (empty())
- return 0;
-
if (Val.template is<EltTy>())
if (Val.template is<EltTy>())
- return begin() +
1
;
+ return begin() +
(Val.isNull() ? 0 : 1)
;
return Val.template get<VecTy *>()->end();
}
return Val.template get<VecTy *>()->end();
}
@@
-113,6
+116,14
@@
public:
return Val.template get<VecTy*>()->front();
}
return Val.template get<VecTy*>()->front();
}
+ EltTy back() const {
+ assert(!empty() && "vector empty");
+ if (EltTy V = Val.template dyn_cast<EltTy>())
+ return V;
+ return Val.template get<VecTy*>()->back();
+ }
+
+
void push_back(EltTy NewVal) {
assert(NewVal != 0 && "Can't add a null value");
void push_back(EltTy NewVal) {
assert(NewVal != 0 && "Can't add a null value");
@@
-132,6
+143,15
@@
public:
Val.template get<VecTy*>()->push_back(NewVal);
}
Val.template get<VecTy*>()->push_back(NewVal);
}
+ void pop_back() {
+ // If we have a single value, convert to empty.
+ if (Val.template is<EltTy>())
+ Val = (EltTy)0;
+ else if (VecTy *Vec = Val.template get<VecTy*>())
+ Vec->pop_back();
+ }
+
+
void clear() {
// If we have a single value, convert to empty.
if (Val.template is<EltTy>()) {
void clear() {
// If we have a single value, convert to empty.
if (Val.template is<EltTy>()) {
@@
-153,12
+173,14
@@
public:
// benefit to collapsing back to a pointer
return Vec->erase(I);
}
// benefit to collapsing back to a pointer
return Vec->erase(I);
}
-
- return 0;
+ return end();
}
private:
void operator=(const TinyPtrVector&); // NOT IMPLEMENTED YET.
}
private:
void operator=(const TinyPtrVector&); // NOT IMPLEMENTED YET.
+#if LLVM_USE_RVALUE_REFERENCES
+ void operator=(TinyPtrVector&&); // NOT IMPLEMENTED YET.
+#endif
};
} // end namespace llvm
};
} // end namespace llvm