From 66fbe58442fb317372be457dc24730cac8e34eb5 Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Sun, 21 Apr 2019 04:48:32 +0000 Subject: [PATCH] [JITLink] Remove an overly strict error check in JITLink's eh-frame parser. The error check required FDEs to refer to the most recent CIE, but the eh-frame spec allows them to refer to any previously seen CIE. This patch removes the offending check. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@358840 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../JITLink/JITLink_EHFrameSupport.cpp | 16 ++++------------ .../JITLink/JITLink_EHFrameSupportImpl.h | 1 - 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/lib/ExecutionEngine/JITLink/JITLink_EHFrameSupport.cpp b/lib/ExecutionEngine/JITLink/JITLink_EHFrameSupport.cpp index 8d94e46cf22..2aa4a45600c 100644 --- a/lib/ExecutionEngine/JITLink/JITLink_EHFrameSupport.cpp +++ b/lib/ExecutionEngine/JITLink/JITLink_EHFrameSupport.cpp @@ -164,7 +164,6 @@ Error EHFrameParser::processCIE() { LLVM_DEBUG(dbgs() << " Record is CIE\n"); /// Reset state for the new CIE. - MostRecentCIE = CurRecordAtom; LSDAFieldPresent = false; uint8_t Version = 0; @@ -276,26 +275,19 @@ Error EHFrameParser::processFDE(JITTargetAddress CIEPointerAddress, uint32_t CIEPointer) { LLVM_DEBUG(dbgs() << " Record is FDE\n"); - // Sanity check the CIE pointer: if this is an FDE it must be proceeded by - // a CIE. - if (MostRecentCIE == nullptr) - return make_error("__eh_frame must start with CIE, not " - "FDE"); - LLVM_DEBUG({ dbgs() << " CIE pointer: " << format("0x%016" PRIx64, CIEPointerAddress - CIEPointer) << "\n"; }); - // Verify that this FDE's CIE pointer points to the most recent CIE entry. - if (CIEPointerAddress - CIEPointer != MostRecentCIE->getAddress()) - return make_error("__eh_frame FDE's CIE Pointer does not " - "point at the most recent CIE"); + auto CIEAtom = G.findAtomByAddress(CIEPointerAddress - CIEPointer); + if (!CIEAtom) + return CIEAtom.takeError(); // The CIEPointer looks good. Add a relocation. CurRecordAtom->addEdge(FDEToCIERelocKind, CIEPointerAddress - CurRecordAtom->getAddress(), - *MostRecentCIE, 0); + *CIEAtom, 0); // Read and sanity check the PC-start pointer and size. JITTargetAddress PCBeginAddress = EHFrameAddress + EHFrameReader.getOffset(); diff --git a/lib/ExecutionEngine/JITLink/JITLink_EHFrameSupportImpl.h b/lib/ExecutionEngine/JITLink/JITLink_EHFrameSupportImpl.h index 85b1b803c5d..fe4b182401a 100644 --- a/lib/ExecutionEngine/JITLink/JITLink_EHFrameSupportImpl.h +++ b/lib/ExecutionEngine/JITLink/JITLink_EHFrameSupportImpl.h @@ -50,7 +50,6 @@ private: JITTargetAddress EHFrameAddress; BinaryStreamReader EHFrameReader; DefinedAtom *CurRecordAtom = nullptr; - DefinedAtom *MostRecentCIE = nullptr; bool LSDAFieldPresent = false; Edge::Kind FDEToCIERelocKind; Edge::Kind FDEToTargetRelocKind; -- 2.50.1