[llvm] r336402 - Revert "objdump: Support newer ObjC image info flags"

[Dave Lee via llvm-commits]

Author: kastiglione
Date: Thu Jul  5 17:13:21 2018
New Revision: 336402

URL: http://llvm.org/viewvc/llvm-project?rev=336402&view=rev
Log:
Revert "objdump: Support newer ObjC image info flags"

This reverts commit 8c4cc472e7a67bd3b2b20cc4cf32d31af29bc7e9.

Removed:
    llvm/trunk/test/tools/llvm-objdump/macho-image-info.test
Modified:
    llvm/trunk/tools/llvm-objdump/MachODump.cpp

Removed: llvm/trunk/test/tools/llvm-objdump/macho-image-info.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objdump/macho-image-info.test?rev=336401&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-objdump/macho-image-info.test (original)
+++ llvm/trunk/test/tools/llvm-objdump/macho-image-info.test (removed)
@@ -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

Modified: llvm/trunk/tools/llvm-objdump/MachODump.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/MachODump.cpp?rev=336402&r1=336401&r2=336402&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objdump/MachODump.cpp (original)
+++ llvm/trunk/tools/llvm-objdump/MachODump.cpp Thu Jul  5 17:13:21 2018
@@ -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(SectionRe
     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)