diff options
| -rw-r--r-- | lib/CodeGen/CGExprScalar.cpp | 14 | ||||
| -rw-r--r-- | test/CodeGen/exprs.c | 12 |
2 files changed, 23 insertions, 3 deletions
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp index 1a64e3c905..80aa755e18 100644 --- a/lib/CodeGen/CGExprScalar.cpp +++ b/lib/CodeGen/CGExprScalar.cpp @@ -627,10 +627,18 @@ Value *ScalarExprEmitter::VisitPrePostIncDec(const UnaryOperator *E, int AmountVal = isInc ? 1 : -1; Value *NextVal; - if (isa<llvm::PointerType>(InVal->getType())) { + if (const llvm::PointerType *PT = + dyn_cast<llvm::PointerType>(InVal->getType())) { // FIXME: This isn't right for VLAs. - NextVal = llvm::ConstantInt::get(llvm::Type::Int32Ty, AmountVal); - NextVal = Builder.CreateGEP(InVal, NextVal, "ptrincdec"); + llvm::Constant *Inc =llvm::ConstantInt::get(llvm::Type::Int32Ty, AmountVal); + if (!isa<llvm::FunctionType>(PT->getElementType())) { + NextVal = Builder.CreateGEP(InVal, Inc, "ptrincdec"); + } else { + const llvm::Type *i8Ty = llvm::PointerType::getUnqual(llvm::Type::Int8Ty); + NextVal = Builder.CreateBitCast(InVal, i8Ty, "tmp"); + NextVal = Builder.CreateGEP(NextVal, Inc, "ptrincdec"); + NextVal = Builder.CreateBitCast(NextVal, InVal->getType()); + } } else if (InVal->getType() == llvm::Type::Int1Ty && isInc) { // Bool++ is an interesting case, due to promotion rules, we get: // Bool++ -> Bool = Bool+1 -> Bool = (int)Bool+1 -> diff --git a/test/CodeGen/exprs.c b/test/CodeGen/exprs.c index db60b5a330..c22a4ecc71 100644 --- a/test/CodeGen/exprs.c +++ b/test/CodeGen/exprs.c @@ -67,3 +67,15 @@ int bar() { return ((struct X)foo()).Y + 1; } +// PR3809: INC/DEC of function pointers. +void f2(void); +unsigned f1(void) { + void (*fp)(void) = f2; + + ++fp; + fp++; + --fp; + fp--; + return (unsigned) fp; +} + |