From: Benjamin Kramer <benny.kra@googlemail.com>
Date: Tue, 19 Nov 2013 20:28:04 +0000 (+0000)
Subject: DataLayout: value initialize globals to avoid static construction.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5903eca0d9731d92329322d1a25b81525691dffd;p=oota-llvm.git

DataLayout: value initialize globals to avoid static construction.

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

diff --git a/lib/IR/DataLayout.cpp b/lib/IR/DataLayout.cpp
index 6bdc09eaee4..0e4dfc2944f 100644
--- a/lib/IR/DataLayout.cpp
+++ b/lib/IR/DataLayout.cpp
@@ -118,7 +118,7 @@ LayoutAlignElem::operator==(const LayoutAlignElem &rhs) const {
 }
 
 const LayoutAlignElem
-DataLayout::InvalidAlignmentElem = LayoutAlignElem::get(INVALID_ALIGN, 0, 0, 0);
+DataLayout::InvalidAlignmentElem = { INVALID_ALIGN, 0, 0, 0 };
 
 //===----------------------------------------------------------------------===//
 // PointerAlignElem, PointerAlign support
@@ -145,7 +145,7 @@ PointerAlignElem::operator==(const PointerAlignElem &rhs) const {
 }
 
 const PointerAlignElem
-DataLayout::InvalidPointerElem = PointerAlignElem::get(~0U, 0U, 0U, 0U);
+DataLayout::InvalidPointerElem = { 0U, 0U, 0U, ~0U };
 
 //===----------------------------------------------------------------------===//
 //                       DataLayout Class Implementation