diff options
| author | Cameron Zwarich <zwarich@apple.com> | 2011-02-27 08:06:01 +0000 |
|---|---|---|
| committer | Cameron Zwarich <zwarich@apple.com> | 2011-02-27 08:06:01 +0000 |
| commit | eee444cc4e248ae426cddfcb267eec8fb0fbf691 (patch) | |
| tree | f329bb8266cc3e6c9d36685227e940b93999886b | |
| parent | 60c8b22dad0403497d425f263de0a6b8716dd0a4 (diff) | |
| download | llvm-eee444cc4e248ae426cddfcb267eec8fb0fbf691.tar.gz llvm-eee444cc4e248ae426cddfcb267eec8fb0fbf691.tar.bz2 llvm-eee444cc4e248ae426cddfcb267eec8fb0fbf691.tar.xz | |
Fix PR9324 / <rdar://problem/9052489> by handling the case where a PHI has no uses.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@126567 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/llvm/CodeGen/FunctionLoweringInfo.h | 7 | ||||
| -rw-r--r-- | test/CodeGen/X86/phi-bit-propagation.ll | 20 |
2 files changed, 26 insertions, 1 deletions
diff --git a/include/llvm/CodeGen/FunctionLoweringInfo.h b/include/llvm/CodeGen/FunctionLoweringInfo.h index b41f30d825..7f41222d9b 100644 --- a/include/llvm/CodeGen/FunctionLoweringInfo.h +++ b/include/llvm/CodeGen/FunctionLoweringInfo.h @@ -187,7 +187,12 @@ public: /// InvalidatePHILiveOutRegInfo - Invalidates a PHI's LiveOutInfo, to be /// called when a block is visited before all of its predecessors. void InvalidatePHILiveOutRegInfo(const PHINode *PN) { - unsigned Reg = ValueMap[PN]; + // PHIs with no uses have no ValueMap entry. + DenseMap<const Value*, unsigned>::const_iterator It = ValueMap.find(PN); + if (It == ValueMap.end()) + return; + + unsigned Reg = It->second; LiveOutRegInfo.grow(Reg); LiveOutRegInfo[Reg].IsValid = false; } diff --git a/test/CodeGen/X86/phi-bit-propagation.ll b/test/CodeGen/X86/phi-bit-propagation.ll index da9652f734..94c97229b0 100644 --- a/test/CodeGen/X86/phi-bit-propagation.ll +++ b/test/CodeGen/X86/phi-bit-propagation.ll @@ -33,3 +33,23 @@ return: ; preds = %for.body, %for.cond %retval.0 = phi i1 [ true, %for.body ], [ false, %for.cond ] ret i1 %retval.0 } + +; This test case caused an assertion failure; see PR9324. +define void @func_37() noreturn nounwind ssp { +entry: + br i1 undef, label %lbl_919, label %entry.for.inc_crit_edge + +entry.for.inc_crit_edge: ; preds = %entry + br label %for.inc + +lbl_919: ; preds = %for.cond7.preheader, %entry + br label %for.cond7.preheader + +for.cond7.preheader: ; preds = %for.inc, %lbl_919 + %storemerge.ph = phi i8 [ 0, %lbl_919 ], [ %add, %for.inc ] + br i1 undef, label %for.inc, label %lbl_919 + +for.inc: ; preds = %for.cond7.preheader, %entry.for.inc_crit_edge + %add = add i8 undef, 1 + br label %for.cond7.preheader +} |