diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2011-04-09 09:11:09 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2011-04-09 09:11:09 +0000 |
| commit | 18a2e50a9bfe4ecde57dc3913a7bd98b954ec81a (patch) | |
| tree | 311eab0e3f427f9a24017d942017b25e2f782295 | |
| parent | f5bf464b701908d16f7cee0bbf2b8c8df4f3a917 (diff) | |
Add back a couple checks removed by r129128; the fact that an intitializer
is an array of structures doesn't imply it's a ConstantArray of
ConstantStruct.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@129207 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Transforms/IPO/GlobalOpt.cpp | 10 | ||||
| -rw-r--r-- | test/Transforms/GlobalOpt/2011-04-09-EmptyGlobalCtors.ll | 5 |
2 files changed, 11 insertions, 4 deletions
diff --git a/lib/Transforms/IPO/GlobalOpt.cpp b/lib/Transforms/IPO/GlobalOpt.cpp index 5b6ed2c986..71d13edc96 100644 --- a/lib/Transforms/IPO/GlobalOpt.cpp +++ b/lib/Transforms/IPO/GlobalOpt.cpp @@ -1954,11 +1954,13 @@ GlobalVariable *GlobalOpt::FindGlobalCtors(Module &M) { // only allowed to optimize the initializer if it is unique. if (!GV->hasUniqueInitializer()) return 0; - ConstantArray *CA = cast<ConstantArray>(GV->getInitializer()); - + ConstantArray *CA = dyn_cast<ConstantArray>(GV->getInitializer()); + if (!CA) return 0; + for (User::op_iterator i = CA->op_begin(), e = CA->op_end(); i != e; ++i) { - ConstantStruct *CS = cast<ConstantStruct>(*i); - + ConstantStruct *CS = dyn_cast<ConstantStruct>(*i); + if (!CS) return 0; + if (isa<ConstantPointerNull>(CS->getOperand(1))) continue; diff --git a/test/Transforms/GlobalOpt/2011-04-09-EmptyGlobalCtors.ll b/test/Transforms/GlobalOpt/2011-04-09-EmptyGlobalCtors.ll new file mode 100644 index 0000000000..321a487cc8 --- /dev/null +++ b/test/Transforms/GlobalOpt/2011-04-09-EmptyGlobalCtors.ll @@ -0,0 +1,5 @@ +; RUN: opt < %s -globalopt -disable-output + +%0 = type { i32, void ()* } +@llvm.global_ctors = appending global [0 x %0] zeroinitializer + |