[llvm] 7d507ff - [PowerPC] Fix missing GOT indirect variant kind

[Stefan Pintilie via llvm-commits]

Author: Stefan Pintilie
Date: 2020-05-06T05:50:56-05:00
New Revision: 7d507ff55f6c7e44233be129072de1309b96d96d

URL: https://github.com/llvm/llvm-project/commit/7d507ff55f6c7e44233be129072de1309b96d96d
DIFF: https://github.com/llvm/llvm-project/commit/7d507ff55f6c7e44233be129072de1309b96d96d.diff

LOG: [PowerPC] Fix missing GOT indirect variant kind

The function MCSymbolRefExpr::getVariantKindForName was missing the entry for
VK_PPC_GOT_PCREL. This patch adds the missing entry.

Differential Revision: https://reviews.llvm.org/D79015

Added: 
    llvm/test/MC/PowerPC/future-reloc.s

Modified: 
    llvm/lib/MC/MCExpr.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/MC/MCExpr.cpp b/llvm/lib/MC/MCExpr.cpp
index ead2ef21c617..429531165585 100644
--- a/llvm/lib/MC/MCExpr.cpp
+++ b/llvm/lib/MC/MCExpr.cpp
@@ -435,6 +435,7 @@ MCSymbolRefExpr::getVariantKindForName(StringRef Name) {
     .Case("got at tlsld@l", VK_PPC_GOT_TLSLD_LO)
     .Case("got at tlsld@h", VK_PPC_GOT_TLSLD_HI)
     .Case("got at tlsld@ha", VK_PPC_GOT_TLSLD_HA)
+    .Case("got at pcrel", VK_PPC_GOT_PCREL)
     .Case("notoc", VK_PPC_NOTOC)
     .Case("gdgot", VK_Hexagon_GD_GOT)
     .Case("gdplt", VK_Hexagon_GD_PLT)

diff  --git a/llvm/test/MC/PowerPC/future-reloc.s b/llvm/test/MC/PowerPC/future-reloc.s
new file mode 100644
index 000000000000..6dd7fea64171
--- /dev/null
+++ b/llvm/test/MC/PowerPC/future-reloc.s
@@ -0,0 +1,53 @@
+# RUN: llvm-mc -triple=powerpc64le-unknown-unknown -filetype=obj %s 2>&1 | \
+# RUN: FileCheck %s -check-prefix=MC
+# RUN: llvm-mc -triple=powerpc64le-unknown-unknown -filetype=obj %s | \
+# RUN: llvm-readobj -r | FileCheck %s -check-prefix=READOBJ
+
+# This test checks that on Power PC we can correctly convert @pcrel and
+# @got at pcrel into R_PPC64_PCREL34 and R_PPC64_GOT_PCREL34.
+
+# MC-NOT:    error: invalid variant
+
+# READOBJ:        0x0 R_PPC64_PCREL34 locvalue 0x0
+# READOBJ-NEXT:   0x20 R_PPC64_GOT_PCREL34 evalue 0x0
+
+	.text
+	.abiversion 2
+	.globl	local                   # -- Begin function local
+	.p2align	4
+	.type	local, at function
+local:                                  # @local
+.Llocal$local:
+.Lfunc_begin0:
+# %bb.0:                                # %entry
+	plwa 3, locvalue at PCREL(0), 1
+	blr
+	.long	0
+	.quad	0
+.Lfunc_end0:
+	.size	local, .Lfunc_end0-.Lfunc_begin0
+                                        # -- End function
+	.globl	external                # -- Begin function external
+	.p2align	4
+	.type	external, at function
+external:                               # @external
+.Lexternal$local:
+.Lfunc_begin1:
+# %bb.0:                                # %entry
+	pld 3, evalue at got@pcrel(0), 1
+	lwa 3, 0(3)
+	blr
+	.long	0
+	.quad	0
+.Lfunc_end1:
+	.size	external, .Lfunc_end1-.Lfunc_begin1
+                                        # -- End function
+	.type	locvalue, at object        # @locvalue
+	.section	.bss,"aw", at nobits
+	.globl	locvalue
+	.p2align	2
+locvalue:
+.Llocvalue$local:
+	.long	0                       # 0x0
+	.size	locvalue, 4
+