From: Reid Kleckner <reid@kleckner.net>
Date: Wed, 11 Mar 2015 23:39:36 +0000 (+0000)
Subject: Fix some clang warnings in WinEHPrepare
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d24c2c8cdf5a6bad2920092584555ea1a3f4b003;p=oota-llvm.git

Fix some clang warnings in WinEHPrepare

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@231985 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/CodeGen/WinEHPrepare.cpp b/lib/CodeGen/WinEHPrepare.cpp
index b9830e0b556..05de6bf39fa 100644
--- a/lib/CodeGen/WinEHPrepare.cpp
+++ b/lib/CodeGen/WinEHPrepare.cpp
@@ -261,8 +261,8 @@ private:
 class CatchHandler : public ActionHandler {
 public:
   CatchHandler(BasicBlock *BB, Constant *Selector, BasicBlock *NextBB)
-      : Selector(Selector), NextBB(NextBB), ExceptionObjectVar(nullptr),
-        ActionHandler(BB, ActionType::Catch) {}
+      : ActionHandler(BB, ActionType::Catch), Selector(Selector),
+        NextBB(NextBB), ExceptionObjectVar(nullptr) {}
 
   // Method for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const ActionHandler *H) {
@@ -1140,7 +1140,6 @@ void WinEHPrepare::mapLandingPadBlocks(LandingPadInst *LPad,
   VisitedBlockSet VisitedBlocks;
 
   while (HandlersFound != NumClauses) {
-    Constant *Selector = nullptr;
     BasicBlock *NextBB = nullptr;
 
     // See if the clause we're looking for is a catch-all.