[llvm-commits] [llvm] r63888 - in /llvm/trunk: include/llvm/Transforms/Utils/Local.h lib/Transforms/Scalar/CondPropagate.cpp lib/Transforms/Utils/Local.cpp lib/Transforms/Utils/SimplifyCFG.cpp test/Transforms/CondProp/basictest-dbg.ll
Devang Patel
dpatel at apple.com
Thu Feb 5 13:46:42 PST 2009
Author: dpatel
Date: Thu Feb 5 15:46:41 2009
New Revision: 63888
URL: http://llvm.org/viewvc/llvm-project?rev=63888&view=rev
Log:
Revert rev. 63876. It is causing llvm-gcc bootstrap failure.
Removed:
llvm/trunk/test/Transforms/CondProp/basictest-dbg.ll
Modified:
llvm/trunk/include/llvm/Transforms/Utils/Local.h
llvm/trunk/lib/Transforms/Scalar/CondPropagate.cpp
llvm/trunk/lib/Transforms/Utils/Local.cpp
llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp
Modified: llvm/trunk/include/llvm/Transforms/Utils/Local.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Transforms/Utils/Local.h?rev=63888&r1=63887&r2=63888&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Transforms/Utils/Local.h (original)
+++ llvm/trunk/include/llvm/Transforms/Utils/Local.h Thu Feb 5 15:46:41 2009
@@ -40,14 +40,6 @@
bool ConstantFoldTerminator(BasicBlock *BB);
//===----------------------------------------------------------------------===//
-// CFG Simplification
-//
-
-/// isTerminatorFirstRelevantInsn - Return true if Term is very first
-/// instruction ignoring Phi nodes and dbg intrinsics.
-bool isTerminatorFirstRelevantInsn(BasicBlock *BB, Instruction *Term);
-
-//===----------------------------------------------------------------------===//
// Local dead code elimination.
//
Modified: llvm/trunk/lib/Transforms/Scalar/CondPropagate.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/CondPropagate.cpp?rev=63888&r1=63887&r2=63888&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/CondPropagate.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/CondPropagate.cpp Thu Feb 5 15:46:41 2009
@@ -148,7 +148,7 @@
if (!PN->hasOneUse()) return;
BasicBlock *BB = BI->getParent();
- if (!isTerminatorFirstRelevantInsn (BB, BI))
+ if (&*BB->begin() != PN || &*next(BB->begin()) != BI)
return;
// Ok, we have this really simple case, walk the PHI operands, looking for
@@ -182,7 +182,7 @@
if (!PN->hasOneUse()) return;
BasicBlock *BB = SI->getParent();
- if (!isTerminatorFirstRelevantInsn (BB, SI))
+ if (&*BB->begin() != PN || &*next(BB->begin()) != SI)
return;
bool RemovedPreds = false;
Modified: llvm/trunk/lib/Transforms/Utils/Local.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/Local.cpp?rev=63888&r1=63887&r2=63888&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Utils/Local.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/Local.cpp Thu Feb 5 15:46:41 2009
@@ -148,23 +148,6 @@
return false;
}
-//===----------------------------------------------------------------------===//
-// CFG Simplification
-//
-
-/// isTerminatorFirstRelevantInsn - Return true if Term is very first
-/// instruction ignoring Phi nodes and dbg intrinsics.
-bool llvm::isTerminatorFirstRelevantInsn(BasicBlock *BB, Instruction *Term) {
- BasicBlock::iterator BBI = Term;
- while (BBI != BB->begin()) {
- --BBI;
- if (!isa<DbgInfoIntrinsic>(BBI))
- break;
- }
- if (isa<PHINode>(BBI) || &*BBI == Term)
- return true;
- return false;
-}
//===----------------------------------------------------------------------===//
// Local dead code elimination...
Modified: llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp?rev=63888&r1=63887&r2=63888&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp Thu Feb 5 15:46:41 2009
@@ -1330,6 +1330,20 @@
return true;
}
+/// isTerminatorFirstRelevantInsn - Return true if Term is very first
+/// instruction ignoring Phi nodes and dbg intrinsics.
+static bool isTerminatorFirstRelevantInsn(BasicBlock *BB, Instruction *Term) {
+ BasicBlock::iterator BBI = Term;
+ while (BBI != BB->begin()) {
+ --BBI;
+ if (!isa<DbgInfoIntrinsic>(BBI))
+ break;
+ }
+ if (isa<PHINode>(BBI) || &*BBI == Term)
+ return true;
+ return false;
+}
+
/// SimplifyCondBranchToTwoReturns - If we found a conditional branch that goes
/// to two returning blocks, try to merge them together into one return,
/// introducing a select if the return values disagree.
Removed: llvm/trunk/test/Transforms/CondProp/basictest-dbg.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/CondProp/basictest-dbg.ll?rev=63887&view=auto
==============================================================================
--- llvm/trunk/test/Transforms/CondProp/basictest-dbg.ll (original)
+++ llvm/trunk/test/Transforms/CondProp/basictest-dbg.ll (removed)
@@ -1,45 +0,0 @@
-; RUN: llvm-as < %s | opt -condprop | llvm-dis | \
-; RUN: not grep {br label}
-
- %llvm.dbg.anchor.type = type { i32, i32 }
- %llvm.dbg.compile_unit.type = type { i32, { }*, i32, i8*, i8*, i8*, i1, i1, i8* }
-
- at llvm.dbg.compile_units = linkonce constant %llvm.dbg.anchor.type { i32 458752, i32 17 }, section "llvm.metadata" ;
-
- at .str = internal constant [4 x i8] c"a.c\00", section "llvm.metadata" ; <[4 x i8]*> [#uses=1]
- at .str1 = internal constant [6 x i8] c"/tmp/\00", section "llvm.metadata" ; <[6 x i8]*> [#uses=1]
- at .str2 = internal constant [55 x i8] c"4.2.1 (Based on Apple Inc. build 5636) (LLVM build 00)\00", section "llvm.metadata" ; <[55 x i8]*> [#uses=1]
- at llvm.dbg.compile_unit = internal constant %llvm.dbg.compile_unit.type { i32 458769, { }* bitcast (%llvm.dbg.anchor.type* @llvm.dbg.compile_units to { }*), i32 1, i8* getelementptr ([4 x i8]* @.str, i32 0, i32 0), i8* getelementptr ([6 x i8]* @.str1, i32 0, i32 0), i8* getelementptr ([55 x i8]* @.str2, i32 0, i32 0), i1 true, i1 false, i8* null }, section "llvm.metadata" ; <%llvm.dbg.compile_unit.type*> [#uses=1]
-
-declare void @llvm.dbg.stoppoint(i32, i32, { }*) nounwind
-
-
-define i32 @test(i1 %C) {
- br i1 %C, label %T1, label %F1
-
-T1: ; preds = %0
-call void @llvm.dbg.stoppoint(i32 5, i32 0, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*))
- br label %Cont
-
-F1: ; preds = %0
-call void @llvm.dbg.stoppoint(i32 5, i32 0, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*))
- br label %Cont
-
-Cont: ; preds = %F1, %T1
- %C2 = phi i1 [ false, %F1 ], [ true, %T1 ] ; <i1> [#uses=1]
-call void @llvm.dbg.stoppoint(i32 5, i32 0, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*))
- br i1 %C2, label %T2, label %F2
-
-T2: ; preds = %Cont
-call void @llvm.dbg.stoppoint(i32 5, i32 0, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*))
- call void @bar( )
-call void @llvm.dbg.stoppoint(i32 5, i32 0, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*))
- ret i32 17
-
-F2: ; preds = %Cont
-call void @llvm.dbg.stoppoint(i32 5, i32 0, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*))
- ret i32 1
-}
-
-declare void @bar()
-
More information about the llvm-commits
mailing list