diff options
author | Tom Stellard <thomas.stellard@amd.com> | 2013-10-02 17:04:59 +0000 |
---|---|---|
committer | Tom Stellard <thomas.stellard@amd.com> | 2013-10-02 17:04:59 +0000 |
commit | af7ae9d6890ce5fae27e38ccebb5da09288c49e0 (patch) | |
tree | ac60a2aa5ba85017bed86412421a330bbb768077 | |
parent | ea246d6af8f112001c8b13ffcc9c4fcc6ad992a2 (diff) | |
download | external_llvm-af7ae9d6890ce5fae27e38ccebb5da09288c49e0.zip external_llvm-af7ae9d6890ce5fae27e38ccebb5da09288c49e0.tar.gz external_llvm-af7ae9d6890ce5fae27e38ccebb5da09288c49e0.tar.bz2 |
StructurizeCFG: Add dependency on LowerSwitch pass
Switch instructions were crashing the StructurizeCFG pass, and it's
probably easier anyway if we don't need to handle them in this pass.
Reviewed-by: Christian König <christian.koenig@amd.com>
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@191841 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/Transforms/Scalar/StructurizeCFG.cpp | 4 | ||||
-rw-r--r-- | test/Transforms/StructurizeCFG/switch.ll | 23 |
2 files changed, 26 insertions, 1 deletions
diff --git a/lib/Transforms/Scalar/StructurizeCFG.cpp b/lib/Transforms/Scalar/StructurizeCFG.cpp index bb6f163..72fea80 100644 --- a/lib/Transforms/Scalar/StructurizeCFG.cpp +++ b/lib/Transforms/Scalar/StructurizeCFG.cpp @@ -231,7 +231,7 @@ public: StructurizeCFG() : RegionPass(ID) { - initializeRegionInfoPass(*PassRegistry::getPassRegistry()); + initializeStructurizeCFGPass(*PassRegistry::getPassRegistry()); } using Pass::doInitialization; @@ -244,6 +244,7 @@ public: } void getAnalysisUsage(AnalysisUsage &AU) const { + AU.addRequiredID(LowerSwitchID); AU.addRequired<DominatorTree>(); AU.addPreserved<DominatorTree>(); RegionPass::getAnalysisUsage(AU); @@ -256,6 +257,7 @@ char StructurizeCFG::ID = 0; INITIALIZE_PASS_BEGIN(StructurizeCFG, "structurizecfg", "Structurize the CFG", false, false) +INITIALIZE_PASS_DEPENDENCY(LowerSwitch) INITIALIZE_PASS_DEPENDENCY(DominatorTree) INITIALIZE_PASS_DEPENDENCY(RegionInfo) INITIALIZE_PASS_END(StructurizeCFG, "structurizecfg", "Structurize the CFG", diff --git a/test/Transforms/StructurizeCFG/switch.ll b/test/Transforms/StructurizeCFG/switch.ll new file mode 100644 index 0000000..316df57 --- /dev/null +++ b/test/Transforms/StructurizeCFG/switch.ll @@ -0,0 +1,23 @@ +; RUN: opt -S -structurizecfg %s -o - | FileCheck %s + +; The structurizecfg pass cannot handle switch instructions, so we need to +; make sure the lower switch pass is always run before structurizecfg. + +; CHECK-LABEL: @switch +define void @switch(i32 addrspace(1)* %out, i32 %cond) nounwind { +entry: +; CHECK: icmp + switch i32 %cond, label %done [ i32 0, label %zero] + +; CHECK: zero: +zero: +; CHECK: store i32 7, i32 addrspace(1)* %out + store i32 7, i32 addrspace(1)* %out +; CHECK: br label %done + br label %done + +; CHECK: done: +done: +; CHECK: ret void + ret void +} |