From ab184fb88d0f9bbab1462aa46fe7f37fb26beec9 Mon Sep 17 00:00:00 2001
From: NAKAMURA Takumi <geek4civic@gmail.com>
Date: Sat, 19 Jul 2014 03:29:25 +0000
Subject: [PATCH] MergedLoadStoreMotion.cpp: Fix msc17 build. Member
 initializer is unavailable.

llvm-svn: 213448
---
 llvm/lib/Transforms/Scalar/MergedLoadStoreMotion.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/llvm/lib/Transforms/Scalar/MergedLoadStoreMotion.cpp b/llvm/lib/Transforms/Scalar/MergedLoadStoreMotion.cpp
index a10733952be4..7be4715f15d8 100644
--- a/llvm/lib/Transforms/Scalar/MergedLoadStoreMotion.cpp
+++ b/llvm/lib/Transforms/Scalar/MergedLoadStoreMotion.cpp
@@ -108,7 +108,8 @@ class MergedLoadStoreMotion : public FunctionPass {
 
 public:
   static char ID; // Pass identification, replacement for typeid
-  explicit MergedLoadStoreMotion(void) : FunctionPass(ID), MD(nullptr) {
+  explicit MergedLoadStoreMotion(void)
+      : FunctionPass(ID), MD(nullptr), MagicCompileTimeControl(250) {
     initializeMergedLoadStoreMotionPass(*PassRegistry::getPassRegistry());
   }
 
@@ -150,7 +151,7 @@ private:
   // where Size0 and Size1 are the #instructions on the two sides of
   // the diamond. The constant chosen here is arbitrary. Compiler Time
   // Control is enforced by the check Size0 * Size1 < MagicCompileTimeControl.
-  const int MagicCompileTimeControl = 250;
+  const int MagicCompileTimeControl;
 };
 
 char MergedLoadStoreMotion::ID = 0;