aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Lenharth <andrewl@lenharth.org>2007-02-13 00:37:50 +0000
committerAndrew Lenharth <andrewl@lenharth.org>2007-02-13 00:37:50 +0000
commitf7e804b683d529e938d8144996558ff8d2af5025 (patch)
tree0e8f1e0e4231184efe85443ec52a187b0c6fefa1
parent1bc3fa6451f9704899316bacdebe6dd3908f17bd (diff)
I love non-deturminism. Returning objects with references to stack objects is a bad idea (TM).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@34210 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/llvm/Support/PatternMatch.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/include/llvm/Support/PatternMatch.h b/include/llvm/Support/PatternMatch.h
index 3cf037fa05..ab9e45f312 100644
--- a/include/llvm/Support/PatternMatch.h
+++ b/include/llvm/Support/PatternMatch.h
@@ -223,19 +223,22 @@ inline Shr_match<LHS, RHS> m_Shr(const LHS &L, const RHS &R) {
template<typename LHS_t, typename RHS_t, typename Class, typename OpcType>
struct BinaryOpClass_match {
- OpcType &Opcode;
+ OpcType *Opcode;
LHS_t L;
RHS_t R;
BinaryOpClass_match(OpcType &Op, const LHS_t &LHS,
const RHS_t &RHS)
- : Opcode(Op), L(LHS), R(RHS) {}
+ : Opcode(&Op), L(LHS), R(RHS) {}
+ BinaryOpClass_match(const LHS_t &LHS, const RHS_t &RHS)
+ : Opcode(0), L(LHS), R(RHS) {}
template<typename OpTy>
bool match(OpTy *V) {
if (Class *I = dyn_cast<Class>(V))
if (L.match(I->getOperand(0)) && R.match(I->getOperand(1))) {
- Opcode = I->getOpcode();
+ if (Opcode)
+ *Opcode = I->getOpcode();
return true;
}
#if 0 // Doesn't handle constantexprs yet!
@@ -257,9 +260,8 @@ m_Shift(Instruction::BinaryOps &Op, const LHS &L, const RHS &R) {
template<typename LHS, typename RHS>
inline BinaryOpClass_match<LHS, RHS, BinaryOperator, Instruction::BinaryOps>
m_Shift(const LHS &L, const RHS &R) {
- Instruction::BinaryOps Op;
return BinaryOpClass_match<LHS, RHS,
- BinaryOperator, Instruction::BinaryOps>(Op, L, R);
+ BinaryOperator, Instruction::BinaryOps>(L, R);
}
//===----------------------------------------------------------------------===//