summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3202bec)
raw | patch | inline | side by side (parent: 3202bec)
author | Benjamin Kramer <benny.kra@googlemail.com> | |
Mon, 27 Jan 2014 13:11:43 +0000 (13:11 +0000) | ||
committer | Benjamin Kramer <benny.kra@googlemail.com> | |
Mon, 27 Jan 2014 13:11:43 +0000 (13:11 +0000) |
Insert before the terminating instruction of the dominating block instead.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200218 91177308-0d34-0410-b5e6-96231b3b80d8
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200218 91177308-0d34-0410-b5e6-96231b3b80d8
lib/Transforms/Scalar/ConstantHoisting.cpp | patch | blob | history | |
test/Transforms/ConstantHoisting/X86/lit.local.cfg | [new file with mode: 0644] | patch | blob |
test/Transforms/ConstantHoisting/X86/phi.ll | [new file with mode: 0644] | patch | blob |
diff --git a/lib/Transforms/Scalar/ConstantHoisting.cpp b/lib/Transforms/Scalar/ConstantHoisting.cpp
index 883385d3775fcebf9b85883a7c8138e6adf9f4f4..c4cf85f95267656e587e3c141f18eeafc322b464 100644 (file)
return (*BBs.begin())->getFirstInsertionPt();
}
+/// \brief Find the instruction we should insert the constant materialization
+/// before.
+static Instruction *getMatInsertPt(Instruction *I, const DominatorTree *DT) {
+ if (!isa<PHINode>(I) && !isa<LandingPadInst>(I)) // Simple case.
+ return I;
+
+ // We can't insert directly before a phi node or landing pad. Insert before
+ // the terminator of the dominating block.
+ assert(&I->getParent()->getParent()->getEntryBlock() != I->getParent() &&
+ "PHI or landing pad in entry block!");
+ BasicBlock *IDom = DT->getNode(I->getParent())->getIDom()->getBlock();
+ return IDom->getTerminator();
+}
+
/// \brief Emit materialization code for all rebased constants and update their
/// users.
void ConstantHoisting::EmitBaseConstants(Function &F, User *U,
Instruction *Mat = Base;
if (!Offset->isNullValue()) {
Mat = BinaryOperator::Create(Instruction::Add, Base, Offset,
- "const_mat", I);
+ "const_mat", getMatInsertPt(I, DT));
// Use the same debug location as the instruction we are about to update.
Mat->setDebugLoc(I->getDebugLoc());
continue;
Instruction *Mat = Base;
+ Instruction *InsertBefore = getMatInsertPt(I, DT);
if (!Offset->isNullValue()) {
Mat = BinaryOperator::Create(Instruction::Add, Base, Offset,
- "const_mat", I);
+ "const_mat", InsertBefore);
// Use the same debug location as the instruction we are about to
// update.
}
Instruction *ICE = CE->getAsInstruction();
ICE->replaceUsesOfWith(OriginalConstant, Mat);
- ICE->insertBefore(I);
+ ICE->insertBefore(InsertBefore);
// Use the same debug location as the instruction we are about to update.
ICE->setDebugLoc(I->getDebugLoc());
diff --git a/test/Transforms/ConstantHoisting/X86/lit.local.cfg b/test/Transforms/ConstantHoisting/X86/lit.local.cfg
--- /dev/null
@@ -0,0 +1,4 @@
+targets = set(config.root.targets_to_build.split())
+if not 'X86' in targets:
+ config.unsupported = True
+
diff --git a/test/Transforms/ConstantHoisting/X86/phi.ll b/test/Transforms/ConstantHoisting/X86/phi.ll
--- /dev/null
@@ -0,0 +1,48 @@
+; RUN: opt -S -consthoist < %s | FileCheck %s
+
+target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-apple-macosx10.9.0"
+
+; PR18626
+define i8* @test1(i1 %cmp, i64* %tmp) {
+entry:
+ call void @foo(i8* inttoptr (i64 68719476735 to i8*))
+ br i1 %cmp, label %if.end, label %return
+
+if.end: ; preds = %bb1
+ call void @foo(i8* inttoptr (i64 68719476736 to i8*))
+ br label %return
+
+return:
+ %retval.0 = phi i8* [ null, %entry ], [ inttoptr (i64 68719476736 to i8*), %if.end ]
+ store i64 1172321806, i64* %tmp
+ ret i8* %retval.0
+
+; CHECK-LABEL: @test1
+; CHECK: entry:
+; CHECK: %const_mat = add i64 %const, 1
+; CHECK-NEXT: %1 = inttoptr i64 %const_mat to i8*
+; CHECK-NEXT: br i1 %cmp
+; CHECK: %retval.0 = phi i8* [ null, %entry ], [ %1, %if.end ]
+}
+
+define void @test2(i1 %cmp, i64** %tmp) {
+entry:
+ call void @foo(i8* inttoptr (i64 68719476736 to i8*))
+ br i1 %cmp, label %if.end, label %return
+
+if.end: ; preds = %bb1
+ call void @foo(i8* inttoptr (i64 68719476736 to i8*))
+ br label %return
+
+return:
+ store i64* inttoptr (i64 68719476735 to i64*), i64** %tmp
+ ret void
+
+; CHECK-LABEL: @test2
+; CHECK: return:
+; CHECK-NEXT: %const_mat = add i64 %const, -1
+; CHECK-NEXT: inttoptr i64 %const_mat to i64*
+}
+
+declare void @foo(i8*)