[NFC] Simplify making trivial scalar pair types.

Author: rjmccall

lib/IRGen/GenIntegerLiteral.cpp

@@ -36,38 +36,26 @@ namespace {
 
 /// A TypeInfo implementation for Builtin.IntegerLiteral.
 class IntegerLiteralTypeInfo :
-  public ScalarPairTypeInfo<IntegerLiteralTypeInfo, LoadableTypeInfo> {
+  public TrivialScalarPairTypeInfo<IntegerLiteralTypeInfo, LoadableTypeInfo> {
 
 public:
   IntegerLiteralTypeInfo(llvm::StructType *storageType,
                          Size size, Alignment align, SpareBitVector &&spareBits)
-      : ScalarPairTypeInfo(storageType, size, std::move(spareBits), align,
-                           IsPOD, IsFixedSize) {}
+      : TrivialScalarPairTypeInfo(storageType, size, std::move(spareBits), align,
+                                  IsPOD, IsFixedSize) {}
 
   static Size getFirstElementSize(IRGenModule &IGM) {
     return IGM.getPointerSize();
   }
   static StringRef getFirstElementLabel() {
     return ".data";
   }
-  static bool isFirstElementTrivial() {
-    return true;
-  }
 
   TypeLayoutEntry *buildTypeLayoutEntry(IRGenModule &IGM,
                                         SILType T) const override {
     return IGM.typeLayoutCache.getOrCreateScalarEntry(*this, T);
   }
 
-  void emitRetainFirstElement(IRGenFunction &IGF, llvm::Value *fn,
-                              Optional<Atomicity> atomicity = None) const {}
-  void emitReleaseFirstElement(IRGenFunction &IGF, llvm::Value *fn,
-                               Optional<Atomicity> atomicity = None) const {}
-  void emitAssignFirstElement(IRGenFunction &IGF, llvm::Value *fn,
-                              Address fnAddr) const {
-    IGF.Builder.CreateStore(fn, fnAddr);
-  }
-
   static Size getSecondElementOffset(IRGenModule &IGM) {
     return IGM.getPointerSize();
   }
@@ -77,17 +65,6 @@ class IntegerLiteralTypeInfo :
   static StringRef getSecondElementLabel() {
     return ".flags";
   }
-  bool isSecondElementTrivial() const {
-    return true;
-  }
-  void emitRetainSecondElement(IRGenFunction &IGF, llvm::Value *data,
-                               Optional<Atomicity> atomicity = None) const {}
-  void emitReleaseSecondElement(IRGenFunction &IGF, llvm::Value *data,
-                                Optional<Atomicity> atomicity = None) const {}
-  void emitAssignSecondElement(IRGenFunction &IGF, llvm::Value *context,
-                               Address dataAddr) const {
-    IGF.Builder.CreateStore(context, dataAddr);
-  }
 
   // The data pointer isn't a heap object, but it is an aligned pointer.
   bool mayHaveExtraInhabitants(IRGenModule &IGM) const override {

lib/IRGen/ScalarPairTypeInfo.h

@@ -179,6 +179,43 @@ class ScalarPairTypeInfo : public ScalarTypeInfo<Derived, Base> {
   }
 };
 
+template <class Derived, class Base>
+class TrivialScalarPairTypeInfo : public ScalarPairTypeInfo<Derived, Base> {
+  using super = ScalarPairTypeInfo<Derived, Base>;
+protected:
+  template <class... T> TrivialScalarPairTypeInfo(T &&...args)
+    : super(::std::forward<T>(args)...) {}
+
+  const Derived &asDerived() const {
+    return static_cast<const Derived &>(*this);
+  }
+
+public:
+  static bool isFirstElementTrivial() {
+    return true;
+  }
+  void emitRetainFirstElement(IRGenFunction &IGF, llvm::Value *value,
+                              Optional<Atomicity> atomicity = None) const {}
+  void emitReleaseFirstElement(IRGenFunction &IGF, llvm::Value *value,
+                               Optional<Atomicity> atomicity = None) const {}
+  void emitAssignFirstElement(IRGenFunction &IGF, llvm::Value *value,
+                              Address valueAddr) const {
+    IGF.Builder.CreateStore(value, valueAddr);
+  }
+
+  static bool isSecondElementTrivial() {
+    return true;
+  }
+  void emitRetainSecondElement(IRGenFunction &IGF, llvm::Value *value,
+                               Optional<Atomicity> atomicity = None) const {}
+  void emitReleaseSecondElement(IRGenFunction &IGF, llvm::Value *value,
+                                Optional<Atomicity> atomicity = None) const {}
+  void emitAssignSecondElement(IRGenFunction &IGF, llvm::Value *value,
+                              Address valueAddr) const {
+    IGF.Builder.CreateStore(value, valueAddr);
+  }
+};
+
 }
 }