[DataLayout] Inline static constructors (NFC)

The removed asserts check invariants already checked by the caller.

Author: s-barannikov

llvm/include/llvm/IR/DataLayout.h

@@ -70,9 +70,6 @@ struct LayoutAlignElem {
   Align ABIAlign;
   Align PrefAlign;
 
-  static LayoutAlignElem get(Align ABIAlign, Align PrefAlign,
-                             uint32_t BitWidth);
-
   bool operator==(const LayoutAlignElem &rhs) const;
 };
 
@@ -86,11 +83,6 @@ struct PointerAlignElem {
   Align PrefAlign;
   uint32_t IndexBitWidth;
 
-  /// Initializer
-  static PointerAlignElem getInBits(uint32_t AddressSpace, Align ABIAlign,
-                                    Align PrefAlign, uint32_t TypeBitWidth,
-                                    uint32_t IndexBitWidth);
-
   bool operator==(const PointerAlignElem &rhs) const;
 };
 

llvm/lib/IR/DataLayout.cpp

@@ -142,16 +142,6 @@ class StructLayoutMap {
 // LayoutAlignElem, LayoutAlign support
 //===----------------------------------------------------------------------===//
 
-LayoutAlignElem LayoutAlignElem::get(Align ABIAlign, Align PrefAlign,
-                                     uint32_t BitWidth) {
-  assert(ABIAlign <= PrefAlign && "Preferred alignment worse than ABI!");
-  LayoutAlignElem retval;
-  retval.ABIAlign = ABIAlign;
-  retval.PrefAlign = PrefAlign;
-  retval.TypeBitWidth = BitWidth;
-  return retval;
-}
-
 bool LayoutAlignElem::operator==(const LayoutAlignElem &rhs) const {
   return ABIAlign == rhs.ABIAlign && PrefAlign == rhs.PrefAlign &&
          TypeBitWidth == rhs.TypeBitWidth;
@@ -161,20 +151,6 @@ bool LayoutAlignElem::operator==(const LayoutAlignElem &rhs) const {
 // PointerAlignElem, PointerAlign support
 //===----------------------------------------------------------------------===//
 
-PointerAlignElem PointerAlignElem::getInBits(uint32_t AddressSpace,
-                                             Align ABIAlign, Align PrefAlign,
-                                             uint32_t TypeBitWidth,
-                                             uint32_t IndexBitWidth) {
-  assert(ABIAlign <= PrefAlign && "Preferred alignment worse than ABI!");
-  PointerAlignElem retval;
-  retval.AddressSpace = AddressSpace;
-  retval.ABIAlign = ABIAlign;
-  retval.PrefAlign = PrefAlign;
-  retval.TypeBitWidth = TypeBitWidth;
-  retval.IndexBitWidth = IndexBitWidth;
-  return retval;
-}
-
 bool
 PointerAlignElem::operator==(const PointerAlignElem &rhs) const {
   return (ABIAlign == rhs.ABIAlign && AddressSpace == rhs.AddressSpace &&
@@ -654,7 +630,7 @@ Error DataLayout::setAlignment(AlignTypeEnum AlignType, Align ABIAlign,
     I->PrefAlign = PrefAlign;
   } else {
     // Insert before I to keep the vector sorted.
-    Alignments->insert(I, LayoutAlignElem::get(ABIAlign, PrefAlign, BitWidth));
+    Alignments->insert(I, LayoutAlignElem{BitWidth, ABIAlign, PrefAlign});
   }
   return Error::success();
 }
@@ -689,9 +665,8 @@ Error DataLayout::setPointerAlignmentInBits(uint32_t AddrSpace, Align ABIAlign,
     return A.AddressSpace < AddressSpace;
   });
   if (I == Pointers.end() || I->AddressSpace != AddrSpace) {
-    Pointers.insert(I,
-                    PointerAlignElem::getInBits(AddrSpace, ABIAlign, PrefAlign,
-                                                TypeBitWidth, IndexBitWidth));
+    Pointers.insert(I, PointerAlignElem{AddrSpace, TypeBitWidth, ABIAlign,
+                                        PrefAlign, IndexBitWidth});
   } else {
     I->ABIAlign = ABIAlign;
     I->PrefAlign = PrefAlign;