[llvm] fdb6578 - Revert "[JITLink] Add anonymous symbols in LinkGraph for unnamed temporary symbols"

[via llvm-commits]

Author: luxufan
Date: 2022-01-22T17:26:54+08:00
New Revision: fdb6578514dd3799ad23c8bbb7699577c0fb414d

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

LOG: Revert "[JITLink] Add anonymous symbols in LinkGraph for unnamed temporary symbols"

This reverts commit de872382951572b70dfaefe8d77eb98d15586115.

Buildbot check error

Added: 
    

Modified: 
    llvm/include/llvm/ExecutionEngine/JITLink/riscv.h
    llvm/lib/ExecutionEngine/JITLink/ELFLinkGraphBuilder.h
    llvm/lib/ExecutionEngine/JITLink/ELF_riscv.cpp
    llvm/lib/ExecutionEngine/JITLink/riscv.cpp

Removed: 
    llvm/test/ExecutionEngine/JITLink/RISCV/anonymous_symbol.s


################################################################################
diff  --git a/llvm/include/llvm/ExecutionEngine/JITLink/riscv.h b/llvm/include/llvm/ExecutionEngine/JITLink/riscv.h
index 4d045a23c012b..3c5cdfcfdba40 100644
--- a/llvm/include/llvm/ExecutionEngine/JITLink/riscv.h
+++ b/llvm/include/llvm/ExecutionEngine/JITLink/riscv.h
@@ -79,12 +79,6 @@ enum EdgeKind_riscv : Edge::Kind {
   ///   Fixup <- (Target - Fixup + Addend)
   R_RISCV_CALL,
 
-  /// 32 bits PC relative relocation
-  ///
-  /// Fixup expression:
-  ///   Fixup <- (Target - Fixup + Addend)
-  R_RISCV_32_PCREL,
-
   /// PC relative GOT offset
   ///
   /// Fixup expression:
@@ -143,7 +137,7 @@ enum EdgeKind_riscv : Edge::Kind {
   ///
   /// Fixup expression
   ///   Fixup <- (Target - *{1}Fixup - Addend)
-  R_RISCV_SUB8,
+  R_RISCV_SUB8
 };
 
 /// Returns a string name for the given riscv edge. For debugging purposes

diff  --git a/llvm/lib/ExecutionEngine/JITLink/ELFLinkGraphBuilder.h b/llvm/lib/ExecutionEngine/JITLink/ELFLinkGraphBuilder.h
index 2ab7ed61f71b4..931a60224ee2f 100644
--- a/llvm/lib/ExecutionEngine/JITLink/ELFLinkGraphBuilder.h
+++ b/llvm/lib/ExecutionEngine/JITLink/ELFLinkGraphBuilder.h
@@ -441,15 +441,11 @@ template <typename ELFT> Error ELFLinkGraphBuilder<ELFT>::graphifySymbols() {
                  << "\"\n";
         });
 
-        // In RISCV, temporary symbols (Used to generate dwarf, eh_frame
-        // sections...) will appear in object code's symbol table, and LLVM does
-        // not use names on these temporary symbols (RISCV gnu toolchain uses
-        // names on these temporary symbols). If the symbol is unnamed, add an
-        // anonymous symbol.
+        // Model the section symbols as anonymous symbol.
         auto &GSym =
-            Name->empty()
-                ? G->addAnonymousSymbol(*B, Sym.getValue(), Sym.st_size,
-                                        false, false)
+            Sym.getType() == ELF::STT_SECTION
+                ? G->addAnonymousSymbol(*B, Sym.getValue(), Sym.st_size, false,
+                                        false)
                 : G->addDefinedSymbol(*B, Sym.getValue(), *Name, Sym.st_size, L,
                                       S, Sym.getType() == ELF::STT_FUNC, false);
         setGraphSymbol(SymIndex, GSym);

diff  --git a/llvm/lib/ExecutionEngine/JITLink/ELF_riscv.cpp b/llvm/lib/ExecutionEngine/JITLink/ELF_riscv.cpp
index b3bc5cdb13f1d..4483147c1b1d7 100644
--- a/llvm/lib/ExecutionEngine/JITLink/ELF_riscv.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/ELF_riscv.cpp
@@ -359,12 +359,6 @@ class ELFJITLinker_riscv : public JITLinker<ELFJITLinker_riscv> {
       *FixupPtr = static_cast<uint8_t>(Value);
       break;
     }
-    case R_RISCV_32_PCREL: {
-      // FIXME: It seems that R_RISCV_32_PCREL relocation will only appear in debug sections
-      // like eh_frame section. Currently, because of eh_frame will not be processed in JITLink's RISCV
-      // backend, test this relocation is 
diff icult, so here report error if needs to fixup this relocation
-      return make_error<JITLinkError>("Fixup of relocation type R_RISCV_32_PCREL is not supportted");
-    }
     }
     return Error::success();
   }
@@ -415,8 +409,6 @@ class ELFLinkGraphBuilder_riscv : public ELFLinkGraphBuilder<ELFT> {
       return EdgeKind_riscv::R_RISCV_SUB16;
     case ELF::R_RISCV_SUB8:
       return EdgeKind_riscv::R_RISCV_SUB8;
-    case ELF::R_RISCV_32_PCREL:
-      return EdgeKind_riscv::R_RISCV_32_PCREL;
     }
 
     return make_error<JITLinkError>("Unsupported riscv relocation:" +

diff  --git a/llvm/lib/ExecutionEngine/JITLink/riscv.cpp b/llvm/lib/ExecutionEngine/JITLink/riscv.cpp
index 1dcc3ebb8e97b..4d1ace73a04e3 100644
--- a/llvm/lib/ExecutionEngine/JITLink/riscv.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/riscv.cpp
@@ -38,8 +38,6 @@ const char *getEdgeKindName(Edge::Kind K) {
     return "R_RISCV_PCREL_LO12_S";
   case R_RISCV_CALL:
     return "R_RISCV_CALL";
-  case R_RISCV_32_PCREL:
-    return "R_RISCV_32_PCREL";
   case R_RISCV_ADD64:
     return "R_RISCV_ADD64";
   case R_RISCV_ADD32:

diff  --git a/llvm/test/ExecutionEngine/JITLink/RISCV/anonymous_symbol.s b/llvm/test/ExecutionEngine/JITLink/RISCV/anonymous_symbol.s
deleted file mode 100644
index cb4c59e196dc9..0000000000000
--- a/llvm/test/ExecutionEngine/JITLink/RISCV/anonymous_symbol.s
+++ /dev/null
@@ -1,20 +0,0 @@
-# RUN: llvm-mc -triple=riscv64 -filetype=obj -o %t %s
-# RUN: llvm-jitlink -debug-only=jitlink -noexec %t 2>&1 | FileCheck %s
-#
-# Because of the exist of cfi directive, sections like eh_frame section will be emitted
-# in llvm's object code emission phase. Anonymous symbols will also be emitted to indicate
-# the section start and section end. So that by relocating these symbol, the section length
-# can be calculated.
-#
-# CHECK: Creating defined graph symbol for ELF symbol ""
-# CHECK: Creating defined graph symbol for ELF symbol ""
-        .text
-        .globl main
-        .p2align 2
-        .type main, at function
-main:
-        .cfi_startproc
-        ret
-        .Lfunc_end0:
-        .size main, .Lfunc_end0-main
-        .cfi_endproc