[PATCH] D71443: [MC][PowerPC] Fix a crash when redefining a symbol after .set

Fangrui Song via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Thu Dec 12 17:00:03 PST 2019


MaskRay created this revision.
MaskRay added reviewers: arichardson, hfinkel, luporl.
Herald added subscribers: llvm-commits, shchenz, jsji, kbarton, hiraditya, nemanjai.
Herald added a project: LLVM.

This is probably not valid assembly but we should not crash.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D71443

Files:
  llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp
  llvm/test/MC/PowerPC/ppc64-localentry-symbols.s


Index: llvm/test/MC/PowerPC/ppc64-localentry-symbols.s
===================================================================
--- llvm/test/MC/PowerPC/ppc64-localentry-symbols.s
+++ llvm/test/MC/PowerPC/ppc64-localentry-symbols.s
@@ -32,3 +32,8 @@
   nop
   nop
   .localentry func, 8
+
+## PR44284 Don't crash if err is redefined after .set
+.set err,_err
+.globl err
+err:
Index: llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp
===================================================================
--- llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp
+++ llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp
@@ -201,7 +201,8 @@
 
   void finish() override {
     for (auto *Sym : UpdateOther)
-      copyLocalEntry(Sym, Sym->getVariableValue());
+      if (Sym->isVariable())
+        copyLocalEntry(Sym, Sym->getVariableValue());
   }
 
 private:


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D71443.233715.patch
Type: text/x-patch
Size: 866 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20191213/84f23fb2/attachment.bin>


More information about the llvm-commits mailing list