Address topperc's comments

Author: tclin914

llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp

@@ -991,10 +991,10 @@ void RISCVAsmPrinter::emitMachineConstantPoolValue(
   MCSymbol *MCSym;
 
   if (RCPV->isGlobalValue()) {
-    auto GV = cast<RISCVConstantPoolConstant>(RCPV)->getGlobalValue();
+    auto *GV = cast<RISCVConstantPoolConstant>(RCPV)->getGlobalValue();
     MCSym = getSymbol(GV);
   } else if (RCPV->isBlockAddress()) {
-    auto BA = cast<RISCVConstantPoolConstant>(RCPV)->getBlockAddress();
+    auto *BA = cast<RISCVConstantPoolConstant>(RCPV)->getBlockAddress();
     MCSym = GetBlockAddressSymbol(BA);
   } else {
     assert(RCPV->isExtSymbol() && "unrecognized constant pool value");

llvm/lib/Target/RISCV/RISCVConstantPoolValue.cpp

@@ -40,15 +40,14 @@ RISCVConstantPoolConstant::RISCVConstantPoolConstant(Type *Ty,
     : RISCVConstantPoolValue(Ty, Kind), CVal(GV) {}
 
 RISCVConstantPoolConstant *
-RISCVConstantPoolConstant::Create(const GlobalValue *GV,
-                                  RISCVCP::RISCVCPKind Kind) {
-  return new RISCVConstantPoolConstant(GV->getType(), GV, Kind);
+RISCVConstantPoolConstant::Create(const GlobalValue *GV) {
+  return new RISCVConstantPoolConstant(GV->getType(), GV, RISCVCP::GlobalValue);
 }
 
 RISCVConstantPoolConstant *
-RISCVConstantPoolConstant::Create(const Constant *C,
-                                  RISCVCP::RISCVCPKind Kind) {
-  return new RISCVConstantPoolConstant(C->getType(), C, Kind);
+RISCVConstantPoolConstant::Create(const BlockAddress *BA) {
+  return new RISCVConstantPoolConstant(BA->getType(), BA,
+                                       RISCVCP::BlockAddress);
 }
 
 int RISCVConstantPoolConstant::getExistingMachineCPValue(

llvm/lib/Target/RISCV/RISCVConstantPoolValue.h

@@ -13,6 +13,7 @@
 #ifndef LLVM_LIB_TARGET_RISCV_RISCVCONSTANTPOOLVALUE_H
 #define LLVM_LIB_TARGET_RISCV_RISCVCONSTANTPOOLVALUE_H
 
+#include "llvm/ADT/StringRef.h"
 #include "llvm/CodeGen/MachineConstantPool.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/ErrorHandling.h"
@@ -74,10 +75,8 @@ class RISCVConstantPoolConstant : public RISCVConstantPoolValue {
                             RISCVCP::RISCVCPKind Kind);
 
 public:
-  static RISCVConstantPoolConstant *Create(const GlobalValue *GV,
-                                           RISCVCP::RISCVCPKind Kind);
-  static RISCVConstantPoolConstant *Create(const Constant *C,
-                                           RISCVCP::RISCVCPKind Kind);
+  static RISCVConstantPoolConstant *Create(const GlobalValue *GV);
+  static RISCVConstantPoolConstant *Create(const BlockAddress *BA);
 
   const GlobalValue *getGlobalValue() const;
   const BlockAddress *getBlockAddress() const;
@@ -99,14 +98,14 @@ class RISCVConstantPoolConstant : public RISCVConstantPoolValue {
 };
 
 class RISCVConstantPoolSymbol : public RISCVConstantPoolValue {
-  const std::string S;
+  const StringRef S;
 
   RISCVConstantPoolSymbol(LLVMContext &C, StringRef s);
 
 public:
   static RISCVConstantPoolSymbol *Create(LLVMContext &C, StringRef s);
 
-  std::string getSymbol() const { return S; }
+  StringRef getSymbol() const { return S; }
 
   int getExistingMachineCPValue(MachineConstantPool *CP,
                                 Align Alignment) override;
@@ -116,6 +115,7 @@ class RISCVConstantPoolSymbol : public RISCVConstantPoolValue {
   void print(raw_ostream &O) const override;
 
   bool equals(const RISCVConstantPoolSymbol *A) const { return S == A->S; }
+
   static bool classof(const RISCVConstantPoolValue *RCPV) {
     return RCPV->isExtSymbol();
   }

llvm/lib/Target/RISCV/RISCVISelLowering.cpp

@@ -6435,7 +6435,7 @@ static SDValue getTargetNode(JumpTableSDNode *N, const SDLoc &DL, EVT Ty,
 static SDValue getLargeGlobalAddress(GlobalAddressSDNode *N, SDLoc DL, EVT Ty,
                                      SelectionDAG &DAG) {
   RISCVConstantPoolConstant *CPV =
-      RISCVConstantPoolConstant::Create(N->getGlobal(), RISCVCP::GlobalValue);
+      RISCVConstantPoolConstant::Create(N->getGlobal());
   SDValue CPAddr = DAG.getTargetConstantPool(CPV, Ty, Align(8));
   SDValue LC = DAG.getNode(RISCVISD::LLA, DL, Ty, CPAddr);
   return DAG.getLoad(
@@ -6445,8 +6445,8 @@ static SDValue getLargeGlobalAddress(GlobalAddressSDNode *N, SDLoc DL, EVT Ty,
 
 static SDValue getLargeBlockAddress(BlockAddressSDNode *N, SDLoc DL, EVT Ty,
                                     SelectionDAG &DAG) {
-  RISCVConstantPoolConstant *CPV = RISCVConstantPoolConstant::Create(
-      N->getBlockAddress(), RISCVCP::BlockAddress);
+  RISCVConstantPoolConstant *CPV =
+      RISCVConstantPoolConstant::Create(N->getBlockAddress());
   SDValue CPAddr = DAG.getTargetConstantPool(CPV, Ty, Align(8));
   SDValue LC = DAG.getNode(RISCVISD::LLA, DL, Ty, CPAddr);
   return DAG.getLoad(