From fbc5a4004c1d79e08a3d2e3b9dd1eba94e12e320 Mon Sep 17 00:00:00 2001
From: Nick Lewycky <nicholas@mxc.ca>
Date: Tue, 12 Apr 2011 01:02:45 +0000
Subject: Consider ConstantAggregateZero as well as ConstantArray/Struct.

llvm-svn: 129338
---
 llvm/lib/Transforms/Instrumentation/ProfilingUtils.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'llvm/lib/Transforms/Instrumentation/ProfilingUtils.cpp')

diff --git a/llvm/lib/Transforms/Instrumentation/ProfilingUtils.cpp b/llvm/lib/Transforms/Instrumentation/ProfilingUtils.cpp
index 26b01e8c2fd..7435bc37fbe 100644
--- a/llvm/lib/Transforms/Instrumentation/ProfilingUtils.cpp
+++ b/llvm/lib/Transforms/Instrumentation/ProfilingUtils.cpp
@@ -110,7 +110,7 @@ void llvm::IncrementCounterInBlock(BasicBlock *BB, unsigned CounterNum,
                                    GlobalValue *CounterArray, bool beginning) {
   // Insert the increment after any alloca or PHI instructions...
   BasicBlock::iterator InsertPos = beginning ? BB->getFirstNonPHI() :
-                BB->getTerminator();
+                                   BB->getTerminator();
   while (isa<AllocaInst>(InsertPos))
     ++InsertPos;
 
@@ -151,10 +151,12 @@ void llvm::InsertProfilingShutdownCall(Function *Callee, Module *Mod) {
   // delete it, to replace it with one that has a larger array type.
   std::vector<Constant *> dtors;
   if (GlobalVariable *GlobalDtors = Mod->getNamedGlobal("llvm.global_dtors")) {
-    ConstantArray *InitList =
-        cast<ConstantArray>(GlobalDtors->getInitializer());
-    for (unsigned i = 0, e = InitList->getType()->getNumElements(); i != e; ++i)
-      dtors.push_back(cast<Constant>(InitList->getOperand(i)));
+    if (ConstantArray *InitList =
+        dyn_cast<ConstantArray>(GlobalDtors->getInitializer())) {
+      for (unsigned i = 0, e = InitList->getType()->getNumElements();
+           i != e; ++i)
+        dtors.push_back(cast<Constant>(InitList->getOperand(i)));
+    }
     GlobalDtors->eraseFromParent();
   }
 
-- 
cgit v1.2.3