Make ElementCount get interfaces private. Reduce repeated calls to getType().

Author: paulwalker-arm

llvm/include/llvm/IR/Constants.h

@@ -78,13 +78,20 @@ class ConstantData : public Constant {
 /// Class for constant integers.
 class ConstantInt final : public ConstantData {
   friend class Constant;
+  friend class ConstantVector;
 
   APInt Val;
 
   ConstantInt(Type *Ty, const APInt &V);
 
   void destroyConstantImpl();
 
+  /// Return a ConstantInt with the specified value and an implied Type. The
+  /// type is the vector type whose integer element type corresponds to the bit
+  /// width of the value.
+  static ConstantInt *get(LLVMContext &Context, ElementCount EC,
+                          const APInt &V);
+
 public:
   ConstantInt(const ConstantInt &) = delete;
 
@@ -123,12 +130,6 @@ class ConstantInt final : public ConstantData {
   /// type is the integer type that corresponds to the bit width of the value.
   static ConstantInt *get(LLVMContext &Context, const APInt &V);
 
-  /// Return a ConstantInt with the specified value and an implied Type. The
-  /// type is the vector type whose integer element type corresponds to the bit
-  /// width of the value.
-  static ConstantInt *get(LLVMContext &Context, ElementCount EC,
-                          const APInt &V);
-
   /// Return a ConstantInt constructed from the string strStart with the given
   /// radix.
   static ConstantInt *get(IntegerType *Ty, StringRef Str, uint8_t Radix);
@@ -265,13 +266,20 @@ class ConstantInt final : public ConstantData {
 ///
 class ConstantFP final : public ConstantData {
   friend class Constant;
+  friend class ConstantVector;
 
   APFloat Val;
 
   ConstantFP(Type *Ty, const APFloat &V);
 
   void destroyConstantImpl();
 
+  /// Return a ConstantFP with the specified value and an implied Type. The
+  /// type is the vector type whose element type has the same floating point
+  /// semantics as the value.
+  static ConstantFP *get(LLVMContext &Context, ElementCount EC,
+                         const APFloat &V);
+
 public:
   ConstantFP(const ConstantFP &) = delete;
 
@@ -287,8 +295,6 @@ class ConstantFP final : public ConstantData {
 
   static Constant *get(Type *Ty, StringRef Str);
   static ConstantFP *get(LLVMContext &Context, const APFloat &V);
-  static ConstantFP *get(LLVMContext &Context, ElementCount EC,
-                         const APFloat &V);
   static Constant *getNaN(Type *Ty, bool Negative = false,
                           uint64_t Payload = 0);
   static Constant *getQNaN(Type *Ty, bool Negative = false,

llvm/lib/IR/AsmWriter.cpp

@@ -1502,33 +1502,37 @@ static void WriteAPFloatInternal(raw_ostream &Out, const APFloat &APF) {
 static void WriteConstantInternal(raw_ostream &Out, const Constant *CV,
                                   AsmWriterContext &WriterCtx) {
   if (const ConstantInt *CI = dyn_cast<ConstantInt>(CV)) {
-    if (CI->getType()->isVectorTy()) {
+    Type *Ty = CI->getType();
+
+    if (Ty->isVectorTy()) {
       Out << "splat (";
-      WriterCtx.TypePrinter->print(CI->getType()->getScalarType(), Out);
+      WriterCtx.TypePrinter->print(Ty->getScalarType(), Out);
       Out << " ";
     }
 
-    if (CI->getType()->getScalarType()->isIntegerTy(1))
+    if (Ty->getScalarType()->isIntegerTy(1))
       Out << (CI->getZExtValue() ? "true" : "false");
     else
       Out << CI->getValue();
 
-    if (CI->getType()->isVectorTy())
+    if (Ty->isVectorTy())
       Out << ")";
 
     return;
   }
 
   if (const ConstantFP *CFP = dyn_cast<ConstantFP>(CV)) {
-    if (CFP->getType()->isVectorTy()) {
+    Type *Ty = CFP->getType();
+
+    if (Ty->isVectorTy()) {
       Out << "splat (";
-      WriterCtx.TypePrinter->print(CFP->getType()->getScalarType(), Out);
+      WriterCtx.TypePrinter->print(Ty->getScalarType(), Out);
       Out << " ";
     }
 
     WriteAPFloatInternal(Out, CFP->getValueAPF());
 
-    if (CFP->getType()->isVectorTy())
+    if (Ty->isVectorTy())
       Out << ")";
 
     return;