From 3717aa5ddbf9bd5b14f9604b5bd0803dc7e8fe8a Mon Sep 17 00:00:00 2001 From: Tobias Grosser Date: Sat, 11 Jun 2016 19:17:15 +0000 Subject: This reverts recent expression type changes The recent expression type changes still need more discussion, which will happen on phabricator or on the mailing list. The precise list of commits reverted are: - "Refactor division generation code" - "[NFC] Generate runtime checks after the SCoP" - "[FIX] Determine insertion point during SCEV expansion" - "Look through IntToPtr & PtrToInt instructions" - "Use minimal types for generated expressions" - "Temporarily promote values to i64 again" - "[NFC] Avoid unnecessary comparison for min/max expressions" - "[Polly] Fix -Wunused-variable warnings (NFC)" - "[NFC] Simplify min/max expression generation" - "Simplify the type adjustment in the IslExprBuilder" Some of them are just reverted as we would otherwise get conflicts. I will try to re-commit them if possible. llvm-svn: 272483 --- polly/lib/CodeGen/CodeGeneration.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'polly/lib/CodeGen/CodeGeneration.cpp') diff --git a/polly/lib/CodeGen/CodeGeneration.cpp b/polly/lib/CodeGen/CodeGeneration.cpp index b434144a686..ce1098fa444 100644 --- a/polly/lib/CodeGen/CodeGeneration.cpp +++ b/polly/lib/CodeGen/CodeGeneration.cpp @@ -191,12 +191,7 @@ public: } else { NodeBuilder.addParameters(S.getContext()); - SplitBlock = Builder.GetInsertBlock(); - Builder.SetInsertPoint(&StartBlock->front()); - NodeBuilder.create(AstRoot); - - Builder.SetInsertPoint(SplitBlock->getTerminator()); ExprBuilder.setTrackOverflow(true); Value *RTC = buildRTC(Builder, ExprBuilder); Value *OverflowHappened = Builder.CreateNot( @@ -204,7 +199,10 @@ public: RTC = Builder.CreateAnd(RTC, OverflowHappened, "polly.rtc.result"); ExprBuilder.setTrackOverflow(false); - SplitBlock->getTerminator()->setOperand(0, RTC); + Builder.GetInsertBlock()->getTerminator()->setOperand(0, RTC); + Builder.SetInsertPoint(&StartBlock->front()); + + NodeBuilder.create(AstRoot); NodeBuilder.finalizeSCoP(S); fixRegionInfo(EnteringBB->getParent(), R->getParent()); -- cgit v1.2.3