[PATCH] D97647: [lld][ELF] Removing redundant cast. NFC.

[Sam Clegg via Phabricator via llvm-commits]

sbc100 created this revision.
Herald added subscribers: wingo, sunfish, arichardson, emaste.
Herald added a reviewer: MaskRay.
sbc100 requested review of this revision.
Herald added subscribers: llvm-commits, aheejin.
Herald added a project: LLVM.

Also fix inconsistent use of tabs in merge-string.s.  Two minor
cleanups I found while porting SHF_STRINGS support to wasm-ld.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D97647

Files:
  lld/ELF/InputSection.cpp
  lld/test/ELF/merge-string.s


Index: lld/test/ELF/merge-string.s
===================================================================
--- lld/test/ELF/merge-string.s
+++ lld/test/ELF/merge-string.s
@@ -7,16 +7,16 @@
 // RUN: ld.lld -O 0 %t.o -o %t.so -shared
 // RUN: llvm-readobj -S --section-data --symbols %t.so | FileCheck --check-prefix=NOMERGE %s
 
-        .section	.rodata1,"aMS", at progbits,1
-	.asciz	"abc"
+        .section        .rodata1,"aMS", at progbits,1
+        .asciz  "abc"
 foo:
-	.ascii	"a"
+        .ascii  "a"
 bar:
         .asciz  "bc"
         .asciz  "bc"
 
         .section        .rodata2,"aMS", at progbits,2
-        .align  2
+        .p2align  1
 zed:
         .short  20
         .short  0
Index: lld/ELF/InputSection.cpp
===================================================================
--- lld/ELF/InputSection.cpp
+++ lld/ELF/InputSection.cpp
@@ -1429,10 +1429,9 @@
 uint64_t MergeInputSection::getParentOffset(uint64_t offset) const {
   // If Offset is not at beginning of a section piece, it is not in the map.
   // In that case we need to search from the original section piece vector.
-  const SectionPiece &piece =
-      *(const_cast<MergeInputSection *>(this)->getSectionPiece (offset));
-  uint64_t addend = offset - piece.inputOff;
-  return piece.outputOff + addend;
+  const SectionPiece *piece = getSectionPiece(offset);
+  uint64_t addend = offset - piece->inputOff;
+  return piece->outputOff + addend;
 }
 
 template InputSection::InputSection(ObjFile<ELF32LE> &, const ELF32LE::Shdr &,


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D97647.327005.patch
Type: text/x-patch
Size: 1507 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210301/dc90e856/attachment.bin>