Address review feedback

Author: lenary

llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp

@@ -614,10 +614,7 @@ bool RISCVAsmBackend::evaluateTargetFixup(const MCFixup &Fixup,
 
 void RISCVAsmBackend::maybeAddVendorReloc(const MCFragment &F,
                                           const MCFixup &Fixup) {
-  MCContext &Ctx = Asm->getContext();
-
   StringRef VendorIdentifier;
-
   switch (Fixup.getTargetKind()) {
   default:
     // No Vendor Relocation Required.
@@ -632,6 +629,7 @@ void RISCVAsmBackend::maybeAddVendorReloc(const MCFragment &F,
 
   // Create a local symbol for the vendor relocation to reference. It's fine if
   // the symbol has the same name as an existing symbol.
+  MCContext &Ctx = Asm->getContext();
   MCSymbol *VendorSymbol = Ctx.createLocalSymbol(VendorIdentifier);
   auto [It, Inserted] =
       VendorSymbols.try_emplace(VendorIdentifier, VendorSymbol);
@@ -645,12 +643,10 @@ void RISCVAsmBackend::maybeAddVendorReloc(const MCFragment &F,
     VendorSymbol = It->getValue();
   }
 
-  const MCExpr *VendorExpr = MCSymbolRefExpr::create(VendorSymbol, Ctx);
   MCFixup VendorFixup =
-      MCFixup::create(Fixup.getOffset(), VendorExpr, ELF::R_RISCV_VENDOR);
-  // Explicitly create MCValue rather than using
-  // `VendorExpr->evaluateAsRelocatable` so that the absolute symbol is not
-  // evaluated to constant 0.
+      MCFixup::create(Fixup.getOffset(), nullptr, ELF::R_RISCV_VENDOR);
+  // Explicitly create MCValue rather than using an MCExpr and evaluating it so
+  // that the absolute vendor symbol is not evaluated to constant 0.
   MCValue VendorTarget = MCValue::get(VendorSymbol);
   uint64_t VendorValue;
   Asm->getWriter().recordRelocation(F, VendorFixup, VendorTarget, VendorValue);

llvm/test/MC/RISCV/vendor-symbol.s

@@ -8,7 +8,7 @@
 ## relocations do not interfere with symbols with identical names that
 ## are written in assembly.
 
-.option exact
+  .option exact
 
   qc.e.bgeui s0, 20, QUALCOMM
 
@@ -28,5 +28,8 @@ QUALCOMM:
 
 
 # CHECK-LABEL: Symbol table '.symtab'
+# CHECK-NOT: QUALCOMM
 # CHECK: 00000000 0 NOTYPE  LOCAL  DEFAULT ABS QUALCOMM
+# CHECK-NOT: QUALCOMM
 # CHECK: 00000006 0 NOTYPE  GLOBAL DEFAULT   2 QUALCOMM
+# CHECK-NOT: QUALCOMM