From 0bf3fec4cd95d43677c3a4d5b84a505818896817 Mon Sep 17 00:00:00 2001 From: esmeyi Date: Fri, 18 Feb 2022 04:12:32 -0500 Subject: [PATCH] Revert "[XCOFF][llvm-objdump] change the priority of symbols with" This reverts commit 2ad662172cbbd1ca53489bf8bddb0183d7692708. Buildbot failure #19373 --- .../llvm/MC/MCDisassembler/MCDisassembler.h | 11 ++++---- llvm/include/llvm/Object/ObjectFile.h | 2 +- .../aix-prefixed-instruction-boundary.mir | 2 +- llvm/test/CodeGen/PowerPC/aix-return55.ll | 2 +- .../PowerPC/aix-user-defined-memcpy.ll | 2 +- .../PowerPC/aix-xcoff-mergeable-const.ll | 2 +- .../CodeGen/PowerPC/aix-xcoff-reloc-symb.mir | 2 +- llvm/test/CodeGen/PowerPC/aix-xcoff-reloc.ll | 2 +- .../PowerPC/aix-xcoff-textdisassembly.ll | 2 +- .../llvm-objdump/XCOFF/disassemble-all.test | 2 +- .../XCOFF/disassemble-symbol-description.test | 2 +- .../XCOFF/disassemble-symbol-priority.ll | 28 ------------------- .../XCOFF/disassemble-symbolize-operands.ll | 7 +++-- .../llvm-objdump/XCOFF/print-linenumber.test | 2 +- llvm/tools/llvm-objdump/llvm-objdump.cpp | 3 -- 15 files changed, 20 insertions(+), 51 deletions(-) delete mode 100644 llvm/test/tools/llvm-objdump/XCOFF/disassemble-symbol-priority.ll diff --git a/llvm/include/llvm/MC/MCDisassembler/MCDisassembler.h b/llvm/include/llvm/MC/MCDisassembler/MCDisassembler.h index db608d78fd6a0..10037cd66ef12 100644 --- a/llvm/include/llvm/MC/MCDisassembler/MCDisassembler.h +++ b/llvm/include/llvm/MC/MCDisassembler/MCDisassembler.h @@ -46,9 +46,8 @@ struct SymbolInfoTy { Optional Smc, Optional Idx, bool Label) : Addr(Addr), Name(Name), XCOFFSymInfo(Smc, Idx, Label), IsXCOFF(true) {} - SymbolInfoTy(uint64_t Addr, StringRef Name, uint8_t Type, - bool IsXCOFF = false) - : Addr(Addr), Name(Name), Type(Type), IsXCOFF(IsXCOFF) {} + SymbolInfoTy(uint64_t Addr, StringRef Name, uint8_t Type) + : Addr(Addr), Name(Name), Type(Type), IsXCOFF(false) {} bool isXCOFF() const { return IsXCOFF; } private: @@ -56,11 +55,11 @@ struct SymbolInfoTy { assert(P1.IsXCOFF == P2.IsXCOFF && "P1.IsXCOFF should be equal to P2.IsXCOFF."); if (P1.IsXCOFF) - return std::tie(P1.Addr, P1.XCOFFSymInfo, P1.Type, P1.Name) < - std::tie(P2.Addr, P2.XCOFFSymInfo, P2.Type, P2.Name); + return std::tie(P1.Addr, P1.XCOFFSymInfo, P1.Name) < + std::tie(P2.Addr, P2.XCOFFSymInfo, P2.Name); return std::tie(P1.Addr, P1.Name, P1.Type) < - std::tie(P2.Addr, P2.Name, P2.Type); + std::tie(P2.Addr, P2.Name, P2.Type); } }; diff --git a/llvm/include/llvm/Object/ObjectFile.h b/llvm/include/llvm/Object/ObjectFile.h index 1faa070052d5e..bb6f1321a68e8 100644 --- a/llvm/include/llvm/Object/ObjectFile.h +++ b/llvm/include/llvm/Object/ObjectFile.h @@ -170,11 +170,11 @@ class SymbolRef : public BasicSymbolRef { public: enum Type { ST_Unknown, // Type not specified - ST_Other, ST_Data, ST_Debug, ST_File, ST_Function, + ST_Other }; SymbolRef() = default; diff --git a/llvm/test/CodeGen/PowerPC/aix-prefixed-instruction-boundary.mir b/llvm/test/CodeGen/PowerPC/aix-prefixed-instruction-boundary.mir index 2947ae2c39989..9ea49bf40c897 100644 --- a/llvm/test/CodeGen/PowerPC/aix-prefixed-instruction-boundary.mir +++ b/llvm/test/CodeGen/PowerPC/aix-prefixed-instruction-boundary.mir @@ -43,7 +43,7 @@ body: | ... # DIS: Disassembly of section .text: -# DIS: 00000000 <.aix-prefixed-instruction-boundary>: +# DIS: 00000000 <.text>: # DIS-NEXT: 0: 38 60 00 02 li 3, 2 # DIS-NEXT: 4: 06 00 00 00 38 63 00 0d paddi 3, 3, 13, 0 # DIS-NEXT: c: 06 00 00 00 38 63 00 0d paddi 3, 3, 13, 0 diff --git a/llvm/test/CodeGen/PowerPC/aix-return55.ll b/llvm/test/CodeGen/PowerPC/aix-return55.ll index 19e8322f8f8a2..c16b75bb68d8d 100644 --- a/llvm/test/CodeGen/PowerPC/aix-return55.ll +++ b/llvm/test/CodeGen/PowerPC/aix-return55.ll @@ -21,7 +21,7 @@ entry: ; CHECK: blr } -;CHECKOBJ: 00000000 <.foo>: +;CHECKOBJ: 00000000 <.text>: ;CHECKOBJ-NEXT: 0: 38 60 00 37 li 3, 55 ;CHECKOBJ-NEXT: 4: 4e 80 00 20 blr{{[[:space:]] *}} ;CHECKOBJ-NEXT: 00000008 <.rodata.str1.1>: diff --git a/llvm/test/CodeGen/PowerPC/aix-user-defined-memcpy.ll b/llvm/test/CodeGen/PowerPC/aix-user-defined-memcpy.ll index 097eb302e4161..b69b3760c9f4e 100644 --- a/llvm/test/CodeGen/PowerPC/aix-user-defined-memcpy.ll +++ b/llvm/test/CodeGen/PowerPC/aix-user-defined-memcpy.ll @@ -102,7 +102,7 @@ declare void @llvm.memcpy.p0i8.p0i8.i32(i8* nocapture writeonly, i8* nocapture r ; 32-REL-NOT: Type: R_RBR (0x1A) ; 32-DIS: Disassembly of section .text: -; 32-DIS: 00000000 <.memcpy>: +; 32-DIS: 00000000 <.text>: ; 32-DIS-NEXT: 0: 38 60 00 03 li 3, 3 ; 32-DIS-NEXT: 4: 4e 80 00 20 blr ; 32-DIS-NEXT: 8: 60 00 00 00 nop diff --git a/llvm/test/CodeGen/PowerPC/aix-xcoff-mergeable-const.ll b/llvm/test/CodeGen/PowerPC/aix-xcoff-mergeable-const.ll index c7b1d2a0771c1..255472d65c341 100644 --- a/llvm/test/CodeGen/PowerPC/aix-xcoff-mergeable-const.ll +++ b/llvm/test/CodeGen/PowerPC/aix-xcoff-mergeable-const.ll @@ -62,7 +62,7 @@ entry: ;CHECK-NEXT: .space 1 -;CHECKOBJ: 00000000 <.main>: +;CHECKOBJ: 00000000 <.text>: ;CHECKOBJ-NEXT: 0: 38 60 00 00 li 3, 0 ;CHECKOBJ-NEXT: 4: 4e 80 00 20 blr ;CHECKOBJ-NEXT: ...{{[[:space:]] *}} diff --git a/llvm/test/CodeGen/PowerPC/aix-xcoff-reloc-symb.mir b/llvm/test/CodeGen/PowerPC/aix-xcoff-reloc-symb.mir index c64552f9852c0..f650168d5877d 100644 --- a/llvm/test/CodeGen/PowerPC/aix-xcoff-reloc-symb.mir +++ b/llvm/test/CodeGen/PowerPC/aix-xcoff-reloc-symb.mir @@ -75,7 +75,7 @@ body: | # DIS: Disassembly of section .text: # DIS-EMPTY: -# DIS-NEXT: 00000000 <.foo>: +# DIS-NEXT: 00000000 <.text>: # DIS-NEXT: 0: 80 62 00 00 lwz 3, 0(2) # DIS-NEXT: 4: 4e 80 00 20 blr # DIS-EMPTY: diff --git a/llvm/test/CodeGen/PowerPC/aix-xcoff-reloc.ll b/llvm/test/CodeGen/PowerPC/aix-xcoff-reloc.ll index 1bbc12c5a3af5..6ce251bb49fd8 100644 --- a/llvm/test/CodeGen/PowerPC/aix-xcoff-reloc.ll +++ b/llvm/test/CodeGen/PowerPC/aix-xcoff-reloc.ll @@ -422,7 +422,7 @@ declare i32 @bar(i32) ; DIS: {{.*}}aix-xcoff-reloc.ll.tmp.o: file format aixcoff-rs6000 ; DIS: Disassembly of section .text: -; DIS: 00000000 <.foo>: +; DIS: 00000000 <.text>: ; DIS-NEXT: 0: 7c 08 02 a6 mflr 0 ; DIS-NEXT: 4: 90 01 00 08 stw 0, 8(1) ; DIS-NEXT: 8: 94 21 ff c0 stwu 1, -64(1) diff --git a/llvm/test/CodeGen/PowerPC/aix-xcoff-textdisassembly.ll b/llvm/test/CodeGen/PowerPC/aix-xcoff-textdisassembly.ll index 8b73e748e1a89..c8df85da0c855 100644 --- a/llvm/test/CodeGen/PowerPC/aix-xcoff-textdisassembly.ll +++ b/llvm/test/CodeGen/PowerPC/aix-xcoff-textdisassembly.ll @@ -13,7 +13,7 @@ entry: } ; CHECK: Disassembly of section .text:{{[[:space:]] *}} -; CHECK-NEXT: 00000000 <.foo>: +; CHECK-NEXT: 00000000 <.text>: ; CHECK-NEXT: 0: 38 60 00 00 li 3, 0 ; CHECK-NEXT: 4: 4e 80 00 20 blr ; CHECK-NEXT: 8: 60 00 00 00 nop diff --git a/llvm/test/tools/llvm-objdump/XCOFF/disassemble-all.test b/llvm/test/tools/llvm-objdump/XCOFF/disassemble-all.test index 4c96662fc854f..d94d5734a1cbd 100644 --- a/llvm/test/tools/llvm-objdump/XCOFF/disassemble-all.test +++ b/llvm/test/tools/llvm-objdump/XCOFF/disassemble-all.test @@ -18,7 +18,7 @@ CHECK: Inputs/xcoff-section-headers.o: file format aixcoff-rs6000 CHECK: Disassembly of section .text: -CHECK: 00000000 <.func>: +CHECK: 00000000 <.text>: CHECK-NEXT: 0: 80 62 00 04 lwz 3, 4(2) WITH-R-NEXT: 00000002: R_TOC a CHECK-NEXT: 4: 80 63 00 00 lwz 3, 0(3) diff --git a/llvm/test/tools/llvm-objdump/XCOFF/disassemble-symbol-description.test b/llvm/test/tools/llvm-objdump/XCOFF/disassemble-symbol-description.test index f33421cc6c149..16f7137cf3796 100644 --- a/llvm/test/tools/llvm-objdump/XCOFF/disassemble-symbol-description.test +++ b/llvm/test/tools/llvm-objdump/XCOFF/disassemble-symbol-description.test @@ -22,7 +22,7 @@ COMMON: Inputs/xcoff-section-headers.o: file format aixcoff-rs6000 COMMON: Disassembly of section .text: -PLAIN: 00000000 <.func>: +PLAIN: 00000000 <.text>: DESC: 00000000 (idx: 16) .func: COMMON-NEXT: 0: 80 62 00 04 lwz 3, 4(2) RELOC: 00000002: R_TOC (idx: 26) a[TC] diff --git a/llvm/test/tools/llvm-objdump/XCOFF/disassemble-symbol-priority.ll b/llvm/test/tools/llvm-objdump/XCOFF/disassemble-symbol-priority.ll deleted file mode 100644 index 6db8451ea6a13..0000000000000 --- a/llvm/test/tools/llvm-objdump/XCOFF/disassemble-symbol-priority.ll +++ /dev/null @@ -1,28 +0,0 @@ -; RUN: llc -mtriple=powerpc-ibm-aix-xcoff %s -filetype=obj -o %t -; RUN: llvm-objdump %t -d --no-show-raw-insn | FileCheck %s - -; CHECK: Disassembly of section .text: -; CHECK: 00000000 <.foo3>: -; CHECK: 00000020 <.foo4>: -; CHECK: 00000040 <.foo>: -; CHECK: 00000060 <.foo2>: - -define dso_local signext i32 @foo(i32 noundef signext %a) #0 section "explicit_sec" { -entry: - ret i32 %a -} - -define dso_local signext i32 @foo2(i32 noundef signext %a) #0 section "explicit_sec" { -entry: - ret i32 %a -} - -define dso_local signext i32 @foo3(i32 noundef signext %a) #0 { -entry: - ret i32 %a -} - -define dso_local signext i32 @foo4(i32 noundef signext %a) #0 { -entry: - ret i32 %a -} diff --git a/llvm/test/tools/llvm-objdump/XCOFF/disassemble-symbolize-operands.ll b/llvm/test/tools/llvm-objdump/XCOFF/disassemble-symbolize-operands.ll index 95399aa4d41d2..a6742285a148e 100644 --- a/llvm/test/tools/llvm-objdump/XCOFF/disassemble-symbolize-operands.ll +++ b/llvm/test/tools/llvm-objdump/XCOFF/disassemble-symbolize-operands.ll @@ -3,7 +3,8 @@ ; RUN: | FileCheck %s ;; Expect to find the branch labels. -; CHECK-LABEL: <.internal>: +; CHECK-LABEL: <.text>: +;; TODO: <.internal> should be printed instead of <.text>. ; CHECK-NEXT: 0: mr 4, 3 ; CHECK-NEXT: 4: li 3, 0 ; CHECK-NEXT: 8: mtctr 4 @@ -18,11 +19,11 @@ ; CHECK-NEXT: 60: bf 8, 0x84 ; CHECK-NEXT: : ; CHECK-NEXT: 64: mr 3, 31 -; CHECK-NEXT: 68: bl 0x0 <.internal> +; CHECK-NEXT: 68: bl 0x0 <.text> ; CHECK-NEXT: 6c: mr 31, 3 ; CHECK-NEXT: 70: cmplwi 3, 11 ; CHECK-NEXT: 74: bt 0, 0x60 -; CHECK-NEXT: 78: bl 0x0 <.internal> +; CHECK-NEXT: 78: bl 0x0 <.text> ; CHECK-NEXT: 7c: nop ; CHECK-NEXT: 80: b 0x60 ; CHECK-NEXT: : diff --git a/llvm/test/tools/llvm-objdump/XCOFF/print-linenumber.test b/llvm/test/tools/llvm-objdump/XCOFF/print-linenumber.test index 8256e27c064dd..0f3acacae4389 100644 --- a/llvm/test/tools/llvm-objdump/XCOFF/print-linenumber.test +++ b/llvm/test/tools/llvm-objdump/XCOFF/print-linenumber.test @@ -17,7 +17,7 @@ # LINES32: Inputs/basic32.o: file format aixcoff-rs6000 # LINES32: Disassembly of section .text: -# LINES32: 00000000 <.main>: +# LINES32: 00000000 <.text>: # LINES32: ; .main(): # LINES32-NEXT: ; /basic.c:1 # LINES32-NEXT: 0: 38 60 00 00 li 3, 0 diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp index 4cb226b795255..6b238fa01d258 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -957,9 +957,6 @@ SymbolInfoTy objdump::createSymbolInfo(const ObjectFile *Obj, getXCOFFSymbolCsectSMC(XCOFFObj, Symbol); return SymbolInfoTy(Addr, Name, Smc, SymbolIndex, isLabel(XCOFFObj, Symbol)); - } else if (Obj->isXCOFF()) { - const SymbolRef::Type SymType = unwrapOrError(Symbol.getType(), FileName); - return SymbolInfoTy(Addr, Name, SymType, true); } else return SymbolInfoTy(Addr, Name, Obj->isELF() ? getElfSymbolType(Obj, Symbol)