Revert "llvm.reloc.none takes a GlobalValue again"

This reverts commit 4ac826513d3f564341d91bb9bc5cbf3a53770b57.

Author: mysterymath

llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp

@@ -4109,11 +4109,11 @@ static Value *optimizeModularFormat(CallInst *CI, IRBuilderBase &B) {
     return nullptr;
 
   Module *M = CI->getModule();
+  LLVMContext &Ctx = M->getContext();
   Function *Callee = CI->getCalledFunction();
-  FunctionCallee ModularFn =
-      M->getOrInsertFunction(FnName, Callee->getFunctionType(),
-                             Callee->getAttributes().removeFnAttribute(
-                                 M->getContext(), "modular-format"));
+  FunctionCallee ModularFn = M->getOrInsertFunction(
+      FnName, Callee->getFunctionType(),
+      Callee->getAttributes().removeFnAttribute(Ctx, "modular-format"));
   CallInst *New = cast<CallInst>(CI->clone());
   New->setCalledFunction(ModularFn);
   New->removeFnAttr("modular-format");
@@ -4123,11 +4123,10 @@ static Value *optimizeModularFormat(CallInst *CI, IRBuilderBase &B) {
     SmallString<20> Name = ImplName;
     Name += '_';
     Name += Aspect;
-    Constant *Sym =
-        M->getOrInsertGlobal(Name, Type::getInt8Ty(M->getContext()));
     Function *RelocNoneFn =
         Intrinsic::getOrInsertDeclaration(M, Intrinsic::reloc_none);
-    B.CreateCall(RelocNoneFn, {Sym});
+    B.CreateCall(RelocNoneFn,
+                 {MetadataAsValue::get(Ctx, MDString::get(Ctx, Name))});
   };
 
   llvm::sort(NeededAspects);

llvm/test/Transforms/InstCombine/modular-format.ll

@@ -89,7 +89,7 @@ declare void @first_arg_idx(i32, ptr, ...) #3
 define void @test_partial_aspects(i32 %arg) {
 ; CHECK-LABEL: @test_partial_aspects(
 ; CHECK-NEXT:    call void (ptr, ...) @multiple_aspects_mod(ptr nonnull @.str.int, i32 [[ARG:%.*]])
-; CHECK-NEXT:    call void @llvm.reloc.none(ptr nonnull @basic_impl_unknown)
+; CHECK-NEXT:    call void @llvm.reloc.none(metadata !"basic_impl_unknown")
 ; CHECK-NEXT:    ret void
 ;
   call void (ptr, ...) @partial_aspects(ptr @.str.int, i32 %arg)