summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2012-11-16 20:26:47 +0000
committerHans Wennborg <hans@hanshq.net>2012-11-16 20:26:47 +0000
commitaab71049dfcabab6841d7113a66b3f57bbb577b5 (patch)
tree2d9bca11ee47fbbe383ad591a2f87e8772ae0273
parent1f7de172b4959bd8001d1bf507d068d96d47c045 (diff)
downloadllvm-aab71049dfcabab6841d7113a66b3f57bbb577b5.tar.gz
llvm-aab71049dfcabab6841d7113a66b3f57bbb577b5.tar.bz2
llvm-aab71049dfcabab6841d7113a66b3f57bbb577b5.tar.xz
Merge r168176 from trunk:
SimplifyCFG: Don't assume non-null ScalarTargetTransformInfo. Patch by Pekka Jääskeläinen! git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_32@168194 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Transforms/Utils/SimplifyCFG.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp
index b33d0d473b..c767da624e 100644
--- a/lib/Transforms/Utils/SimplifyCFG.cpp
+++ b/lib/Transforms/Utils/SimplifyCFG.cpp
@@ -3539,7 +3539,8 @@ static bool SwitchToLookupTable(SwitchInst *SI,
assert(SI->getNumCases() > 1 && "Degenerate switch?");
// Only build lookup table when we have a target that supports it.
- if (!TTI || !TTI->getScalarTargetTransformInfo()->shouldBuildLookupTables())
+ if (!TTI || !TTI->getScalarTargetTransformInfo() ||
+ !TTI->getScalarTargetTransformInfo()->shouldBuildLookupTables())
return false;
// FIXME: If the switch is too sparse for a lookup table, perhaps we could