From: Eric Christopher Date: Mon, 24 Jan 2011 23:07:03 +0000 (+0000) Subject: Revert r124146 for now. It appears to be failing on a few platforms. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5af1f066230be7571cffb408048479ad0f06f75e;p=clang Revert r124146 for now. It appears to be failing on a few platforms. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@124153 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp index 8518dd1d23..745757977a 100644 --- a/lib/CodeGen/CGExprScalar.cpp +++ b/lib/CodeGen/CGExprScalar.cpp @@ -302,11 +302,6 @@ public: return EmitScalarPrePostIncDec(E, LV, true, true); } - llvm::Value *EmitAddConsiderOverflowBehavior(const UnaryOperator *E, - llvm::Value *InVal, - llvm::Value *NextVal, - bool IsInc); - llvm::Value *EmitScalarPrePostIncDec(const UnaryOperator *E, LValue LV, bool isInc, bool isPre); @@ -1226,31 +1221,6 @@ Value *ScalarExprEmitter::VisitBlockDeclRefExpr(const BlockDeclRefExpr *E) { // Unary Operators //===----------------------------------------------------------------------===// -llvm::Value *ScalarExprEmitter:: -EmitAddConsiderOverflowBehavior(const UnaryOperator *E, - llvm::Value *InVal, - llvm::Value *NextVal, bool IsInc) { - switch (CGF.getContext().getLangOptions().getSignedOverflowBehavior()) { - case LangOptions::SOB_Undefined: - return Builder.CreateNSWAdd(InVal, NextVal, IsInc ? "inc" : "dec"); - break; - case LangOptions::SOB_Defined: - return Builder.CreateAdd(InVal, NextVal, IsInc ? "inc" : "dec"); - break; - case LangOptions::SOB_Trapping: - BinOpInfo BinOp; - BinOp.LHS = InVal; - BinOp.RHS = NextVal; - BinOp.Ty = E->getType(); - BinOp.Opcode = BO_Add; - BinOp.E = E; - return EmitOverflowCheckedBinOp(BinOp); - break; - } - assert(false && "Unknown SignedOverflowBehaviorTy"); - return 0; -} - llvm::Value *ScalarExprEmitter:: EmitScalarPrePostIncDec(const UnaryOperator *E, LValue LV, bool isInc, bool isPre) { @@ -1300,26 +1270,31 @@ EmitScalarPrePostIncDec(const UnaryOperator *E, LValue LV, // An interesting aspect of this is that increment is always true. // Decrement does not have this property. NextVal = llvm::ConstantInt::getTrue(VMContext); - } else if (ValTy->isVectorType()) { - if (ValTy->hasIntegerRepresentation()) { - NextVal = llvm::ConstantInt::get(InVal->getType(), AmountVal); - - NextVal = ValTy->hasSignedIntegerRepresentation() ? - EmitAddConsiderOverflowBehavior(E, InVal, NextVal, isInc) : - Builder.CreateAdd(InVal, NextVal, isInc ? "inc" : "dec"); - } else { - NextVal = Builder.CreateFAdd( - InVal, - llvm::ConstantFP::get(InVal->getType(), AmountVal), - isInc ? "inc" : "dec"); - } } else if (isa(InVal->getType())) { NextVal = llvm::ConstantInt::get(InVal->getType(), AmountVal); - - NextVal = ValTy->isSignedIntegerType() ? - EmitAddConsiderOverflowBehavior(E, InVal, NextVal, isInc) : - // Unsigned integer inc is always two's complement. - Builder.CreateAdd(InVal, NextVal, isInc ? "inc" : "dec"); + + if (!ValTy->isSignedIntegerType()) + // Unsigned integer inc is always two's complement. + NextVal = Builder.CreateAdd(InVal, NextVal, isInc ? "inc" : "dec"); + else { + switch (CGF.getContext().getLangOptions().getSignedOverflowBehavior()) { + case LangOptions::SOB_Undefined: + NextVal = Builder.CreateNSWAdd(InVal, NextVal, isInc ? "inc" : "dec"); + break; + case LangOptions::SOB_Defined: + NextVal = Builder.CreateAdd(InVal, NextVal, isInc ? "inc" : "dec"); + break; + case LangOptions::SOB_Trapping: + BinOpInfo BinOp; + BinOp.LHS = InVal; + BinOp.RHS = NextVal; + BinOp.Ty = E->getType(); + BinOp.Opcode = BO_Add; + BinOp.E = E; + NextVal = EmitOverflowCheckedBinOp(BinOp); + break; + } + } } else { // Add the inc/dec to the real part. if (InVal->getType()->isFloatTy()) diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 35487fc34f..e84e0e11fb 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -7081,8 +7081,6 @@ static QualType CheckIncrementDecrementOperand(Sema &S, Expr *Op, if (PR.isInvalid()) return QualType(); return CheckIncrementDecrementOperand(S, PR.take(), VK, OpLoc, isInc, isPrefix); - } else if (S.getLangOptions().AltiVec && ResType->isVectorType()) { - // OK! ( C/C++ Language Extensions for CBEA(Version 2.6) 10.3 ) } else { S.Diag(OpLoc, diag::err_typecheck_illegal_increment_decrement) << ResType << int(isInc) << Op->getSourceRange(); diff --git a/test/CodeGen/builtins-ppc-altivec.c b/test/CodeGen/builtins-ppc-altivec.c index 88b1ffad2e..fbc3148dda 100644 --- a/test/CodeGen/builtins-ppc-altivec.c +++ b/test/CodeGen/builtins-ppc-altivec.c @@ -3113,14 +3113,3 @@ void test7() { res_i = (vf1 <= vf2); // CHECK: @llvm.ppc.altivec.vcmpgefp.p(i32 2 res_i = (vf1 >= vf2); // CHECK: @llvm.ppc.altivec.vcmpgefp.p(i32 2 } - -/* ------------------------------- increment/decrement: ----------------------------- */ -// CHECK: define void @test8 -void test8() { - vector int vi; - vi++; // CHECK: add nsw <4 x i32> {{.*}} - vector unsigned int vui; - --vui; // CHECK: add <4 x i32> {{.*}} - vector float vf; - vf++; // CHECK: fadd <4 x float> {{.*}} -} diff --git a/test/SemaCXX/altivec.cpp b/test/SemaCXX/altivec.cpp index cf0b62a26a..bb7473f742 100644 --- a/test/SemaCXX/altivec.cpp +++ b/test/SemaCXX/altivec.cpp @@ -6,7 +6,7 @@ void f(V4i a) { } -void test1() +void test() { V4i vGCC; vector int vAltiVec; @@ -16,24 +16,3 @@ void test1() bool res = vGCC > vAltiVec; vAltiVec = 0 ? vGCC : vGCC; } - -template -void template_f(T param) { - param++; -} - -void test2() -{ - vector int vi; - ++vi; - vi++; - --vi; - vi--; - vector float vf; - vf++; - - ++vi=vi; - vi++=vi; // expected-error {{expression is not assignable}} - (++vi)[1]=1; - template_f(vi); -}