From e6de96410b4ee0c9ecdf55ffdd8eb612e37c6ae8 Mon Sep 17 00:00:00 2001 From: Dave Lee Date: Fri, 6 Jul 2018 00:13:21 +0000 Subject: [PATCH] Revert "objdump: Support newer ObjC image info flags" This reverts commit 8c4cc472e7a67bd3b2b20cc4cf32d31af29bc7e9. llvm-svn: 336402 --- llvm/test/tools/llvm-objdump/macho-image-info.test | 7 ------- llvm/tools/llvm-objdump/MachODump.cpp | 6 ------ 2 files changed, 13 deletions(-) delete mode 100644 llvm/test/tools/llvm-objdump/macho-image-info.test diff --git a/llvm/test/tools/llvm-objdump/macho-image-info.test b/llvm/test/tools/llvm-objdump/macho-image-info.test deleted file mode 100644 index dbb864f..0000000 --- a/llvm/test/tools/llvm-objdump/macho-image-info.test +++ /dev/null @@ -1,7 +0,0 @@ -# RUN: llvm-mc < %s -triple x86_64-darwin -filetype=obj | llvm-objdump -m -objc-meta-data - | FileCheck %s - -.section __DATA,__objc_imageinfo,regular,no_dead_strip -.long 0 -.long 96 - -# CHECK: OBJC_IMAGE_IS_SIMULATED OBJC_IMAGE_HAS_CATEGORY_CLASS_PROPERTIES diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp index bdf80c7..e7a1f47 100644 --- a/llvm/tools/llvm-objdump/MachODump.cpp +++ b/llvm/tools/llvm-objdump/MachODump.cpp @@ -3229,8 +3229,6 @@ struct imageInfo_t { /* masks for objc_image_info.flags */ #define OBJC_IMAGE_IS_REPLACEMENT (1 << 0) #define OBJC_IMAGE_SUPPORTS_GC (1 << 1) -#define OBJC_IMAGE_IS_SIMULATED (1 << 5) -#define OBJC_IMAGE_HAS_CATEGORY_CLASS_PROPERTIES (1 << 6) struct message_ref64 { uint64_t imp; /* IMP (64-bit pointer) */ @@ -5592,10 +5590,6 @@ static void print_image_info64(SectionRef S, struct DisassembleInfo *info) { outs() << " OBJC_IMAGE_IS_REPLACEMENT"; if (o.flags & OBJC_IMAGE_SUPPORTS_GC) outs() << " OBJC_IMAGE_SUPPORTS_GC"; - if (o.flags & OBJC_IMAGE_IS_SIMULATED) - outs() << " OBJC_IMAGE_IS_SIMULATED"; - if (o.flags & OBJC_IMAGE_HAS_CATEGORY_CLASS_PROPERTIES) - outs() << " OBJC_IMAGE_HAS_CATEGORY_CLASS_PROPERTIES"; swift_version = (o.flags >> 8) & 0xff; if (swift_version != 0) { if (swift_version == 1) -- 2.7.4