replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "[MachO] Fixing ub in MachO BinaryFormat" 

This reverts commit r333797.

This patch is failing on BigEndian bots. I will fix and re-land:

http://lab.llvm.org:8011/builders/clang-ppc64be-linux/builds/19505/

llvm-svn: 333799
This commit is contained in:
Chris Bieneman 2018-06-01 22:28:23 +00:00
parent b44d7a0da1
commit 52b2cc5dab
3 changed files with 1 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/include/llvm/BinaryFormat/MachO.h
View File

@ -1973,11 +1973,9 @@ const uint32_t PPC_THREAD_STATE_COUNT =
// Define a union of all load command structs
#define LOAD_COMMAND_STRUCT(LCStruct) LCStruct LCStruct##_data;
LLVM_PACKED_START
union LLVM_ALIGNAS(4) macho_load_command {
union macho_load_command {
#include "llvm/BinaryFormat/MachO.def"
};
LLVM_PACKED_END
} // end namespace MachO
} // end namespace llvm

1
llvm/unittests/BinaryFormat/CMakeLists.txt
View File

@ -4,7 +4,6 @@ set(LLVM_LINK_COMPONENTS
add_llvm_unittest(BinaryFormatTests
DwarfTest.cpp
MachOTest.cpp
TestFileMagic.cpp
)

43
llvm/unittests/BinaryFormat/MachOTest.cpp
View File

@ -1,43 +0,0 @@
//===- unittest/BinaryFormat/MachOTest.cpp - MachO support tests ----------===//
//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
#include "llvm/BinaryFormat/MachO.h"
#include "gtest/gtest.h"
using namespace llvm;
using namespace llvm::MachO;
TEST(MachOTest, UnalignedLC) {
const unsigned char Valid32BitMachO[] = {
0xCE, 0xFA, 0xED, 0xFE, 0x07, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00,
0x85, 0x80, 0x21, 0x01, 0x01, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00,
0x5F, 0x5F, 0x50, 0x41, 0x47, 0x45, 0x5A, 0x45, 0x52, 0x4F, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x01, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x5F, 0x5F, 0x4C, 0x49,
0x4E, 0x4B, 0x45, 0x44, 0x49, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x40, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00,
0x8C, 0x0B, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
const mach_header *Header =
reinterpret_cast<const mach_header *>(Valid32BitMachO);
ASSERT_EQ(Header->magic, MH_MAGIC);
const unsigned char *Current = Valid32BitMachO + sizeof(mach_header);
const unsigned char *BufferEnd =
Valid32BitMachO + sizeof(mach_header) + Header->sizeofcmds;
while (Current < BufferEnd) {
const macho_load_command *LC =
reinterpret_cast<const macho_load_command *>(Current);
ASSERT_EQ(LC->load_command_data.cmd, LC_SEGMENT);
Current += LC->load_command_data.cmdsize;
}
}