Move enum RISCVCPKind into the class that uses it.

Author: tclin914

llvm/lib/Target/RISCV/RISCVConstantPoolValue.cpp

@@ -22,11 +22,11 @@
 using namespace llvm;
 
 RISCVConstantPoolValue::RISCVConstantPoolValue(LLVMContext &C,
-                                               RISCVCP::RISCVCPKind Kind)
+                                               RISCVCPKind Kind)
     : MachineConstantPoolValue((Type *)Type::getInt64Ty(C)), Kind(Kind) {}
 
 RISCVConstantPoolValue::RISCVConstantPoolValue(Type *Ty,
-                                               RISCVCP::RISCVCPKind Kind)
+                                               RISCVCPKind Kind)
     : MachineConstantPoolValue(Ty), Kind(Kind) {}
 
 int RISCVConstantPoolValue::getExistingMachineCPValue(MachineConstantPool *CP,
@@ -36,18 +36,18 @@ int RISCVConstantPoolValue::getExistingMachineCPValue(MachineConstantPool *CP,
 
 RISCVConstantPoolConstant::RISCVConstantPoolConstant(Type *Ty,
                                                      const Constant *GV,
-                                                     RISCVCP::RISCVCPKind Kind)
+                                                     RISCVCPKind Kind)
     : RISCVConstantPoolValue(Ty, Kind), CVal(GV) {}
 
 RISCVConstantPoolConstant *
 RISCVConstantPoolConstant::Create(const GlobalValue *GV) {
-  return new RISCVConstantPoolConstant(GV->getType(), GV, RISCVCP::GlobalValue);
+  return new RISCVConstantPoolConstant(GV->getType(), GV, RISCVCPKind::GlobalValue);
 }
 
 RISCVConstantPoolConstant *
 RISCVConstantPoolConstant::Create(const BlockAddress *BA) {
   return new RISCVConstantPoolConstant(BA->getType(), BA,
-                                       RISCVCP::BlockAddress);
+                                       RISCVCPKind::BlockAddress);
 }
 
 int RISCVConstantPoolConstant::getExistingMachineCPValue(
@@ -73,7 +73,7 @@ const BlockAddress *RISCVConstantPoolConstant::getBlockAddress() const {
 }
 
 RISCVConstantPoolSymbol::RISCVConstantPoolSymbol(LLVMContext &C, StringRef s)
-    : RISCVConstantPoolValue(C, RISCVCP::ExtSymbol), S(s) {}
+    : RISCVConstantPoolValue(C, RISCVCPKind::ExtSymbol), S(s) {}
 
 RISCVConstantPoolSymbol *RISCVConstantPoolSymbol::Create(LLVMContext &C,
                                                          StringRef s) {

llvm/lib/Target/RISCV/RISCVConstantPoolValue.h

@@ -24,19 +24,14 @@ class BlockAddress;
 class GlobalValue;
 class LLVMContext;
 
-namespace RISCVCP {
-
-enum RISCVCPKind { ExtSymbol, GlobalValue, BlockAddress };
-} // end namespace RISCVCP
-
 /// A RISCV-specific constant pool value.
 class RISCVConstantPoolValue : public MachineConstantPoolValue {
-  RISCVCP::RISCVCPKind Kind;
-
 protected:
-  RISCVConstantPoolValue(LLVMContext &C, RISCVCP::RISCVCPKind Kind);
+  enum class RISCVCPKind { ExtSymbol, GlobalValue, BlockAddress };
 
-  RISCVConstantPoolValue(Type *Ty, RISCVCP::RISCVCPKind Kind);
+  RISCVConstantPoolValue(LLVMContext &C, RISCVCPKind Kind);
+
+  RISCVConstantPoolValue(Type *Ty, RISCVCPKind Kind);
 
   template <typename Derived>
   int getExistingMachineCPValueImpl(MachineConstantPool *CP, Align Alignment) {
@@ -55,12 +50,15 @@ class RISCVConstantPoolValue : public MachineConstantPoolValue {
     return -1;
   }
 
+private:
+  RISCVCPKind Kind;
+
 public:
   ~RISCVConstantPoolValue() = default;
 
-  bool isExtSymbol() const { return Kind == RISCVCP::ExtSymbol; }
-  bool isGlobalValue() const { return Kind == RISCVCP::GlobalValue; }
-  bool isBlockAddress() const { return Kind == RISCVCP::BlockAddress; }
+  bool isExtSymbol() const { return Kind == RISCVCPKind::ExtSymbol; }
+  bool isGlobalValue() const { return Kind == RISCVCPKind::GlobalValue; }
+  bool isBlockAddress() const { return Kind == RISCVCPKind::BlockAddress; }
 
   int getExistingMachineCPValue(MachineConstantPool *CP,
                                 Align Alignment) override;
@@ -72,7 +70,7 @@ class RISCVConstantPoolConstant : public RISCVConstantPoolValue {
   const Constant *CVal;
 
   RISCVConstantPoolConstant(Type *Ty, const Constant *GV,
-                            RISCVCP::RISCVCPKind Kind);
+                            RISCVCPKind Kind);
 
 public:
   static RISCVConstantPoolConstant *Create(const GlobalValue *GV);