[llvm] r355399 - [llvm-objcopy] - Simplify `isCompressable` and fix the issue relative.

[George Rimar via llvm-commits]

Author: grimar
Date: Tue Mar  5 05:07:43 2019
New Revision: 355399

URL: http://llvm.org/viewvc/llvm-project?rev=355399&view=rev
Log:
[llvm-objcopy] - Simplify `isCompressable` and fix the issue relative.

When --compress-debug-sections is given, llvm-objcopy do not compress
sections that have "ZLIB" header in data. Normally this signature is used
in zlib-gnu compression format. But if zlib-gnu used then the name of the compressed
section should start from .z* (e.g .zdebug_info). If it does not, then it is not
a zlib-gnu format and section should be treated as a normal uncompressed section.

Differential revision: https://reviews.llvm.org/D58908

Added:
    llvm/trunk/test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib-header.test
Modified:
    llvm/trunk/tools/llvm-objcopy/ELF/ELFObjcopy.cpp

Added: llvm/trunk/test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib-header.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib-header.test?rev=355399&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib-header.test (added)
+++ llvm/trunk/test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib-header.test Tue Mar  5 05:07:43 2019
@@ -0,0 +1,41 @@
+# REQUIRES: zlib
+
+# RUN: yaml2obj %s -o %t1.o
+# RUN: llvm-objcopy --compress-debug-sections %t1.o %t2.o
+# RUN: llvm-readobj -s %t2.o | FileCheck %s
+
+# Non-.zdebug* sections whose data does start with "ZLIB" should
+# not be considered as zlib-gnu compressed sections.
+
+# In this test we have 2 normal sections, one of them starts with "ZLIB",
+# another starts with "ZZZZ". Check we compress both as expected.
+
+# CHECK:        Name: .debug_foo
+# CHECK-NEXT:   Type: SHT_PROGBITS
+# CHECK-NEXT:   Flags [
+# CHECK-NEXT:     SHF_COMPRESSED
+# CHECK-NEXT:   ]
+
+# CHECK:        Name: .debug_bar
+# CHECK-NEXT:   Type: SHT_PROGBITS
+# CHECK-NEXT:   Flags [
+# CHECK-NEXT:     SHF_COMPRESSED
+# CHECK-NEXT:   ]
+
+--- !ELF
+FileHeader:      
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  Type:            ET_REL
+  Machine:         EM_X86_64
+Sections:        
+  - Name:            .debug_foo
+    Type:            SHT_PROGBITS
+    AddressAlign:    0x0000000000000001
+    # "ZLIB"
+    Content:         5A4C49420000000000000000
+  - Name:            .debug_bar
+    Type:            SHT_PROGBITS
+    AddressAlign:    0x0000000000000001
+    # "ZZZZ"
+    Content:         5A5A5A5A0000000000000000

Modified: llvm/trunk/tools/llvm-objcopy/ELF/ELFObjcopy.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objcopy/ELF/ELFObjcopy.cpp?rev=355399&r1=355398&r2=355399&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objcopy/ELF/ELFObjcopy.cpp (original)
+++ llvm/trunk/tools/llvm-objcopy/ELF/ELFObjcopy.cpp Tue Mar  5 05:07:43 2019
@@ -223,18 +223,9 @@ static Error dumpSectionToFile(StringRef
   return createStringError(object_error::parse_failed, "Section not found");
 }
 
-static bool isCompressed(const SectionBase &Section) {
-  const char *Magic = "ZLIB";
-  return StringRef(Section.Name).startswith(".zdebug") ||
-         (Section.OriginalData.size() > strlen(Magic) &&
-          !strncmp(reinterpret_cast<const char *>(Section.OriginalData.data()),
-                   Magic, strlen(Magic))) ||
-         (Section.Flags & ELF::SHF_COMPRESSED);
-}
-
 static bool isCompressable(const SectionBase &Section) {
-  return !isCompressed(Section) && isDebugSection(Section) &&
-         Section.Name != ".gdb_index";
+  return !(Section.Flags & ELF::SHF_COMPRESSED) &&
+         StringRef(Section.Name).startswith(".debug");
 }
 
 static void replaceDebugSections(