From ef279f96e5d7ad5133c1f8e29645d96ae714aef9 Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Wed, 3 Sep 2014 05:42:52 +0000 Subject: [PATCH] [MCJIT] Make llvm-rtdyld process eh_frame sections in -verify mode (accidentally left out of r217010). Also remove a crufty debugging output statement that was accidentally left in. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@217011 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp | 1 - tools/llvm-rtdyld/llvm-rtdyld.cpp | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp index c42287a480b..07e0d3ab645 100644 --- a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp +++ b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp @@ -860,7 +860,6 @@ void RuntimeDyldCheckerImpl::registerSection( const SectionEntry &Section = getRTDyld().Sections[SectionID]; StringRef SectionName = Section.Name; - dbgs() << "Registering " << SectionName << "\n"; Stubs[FileName][SectionName].SectionID = SectionID; } diff --git a/tools/llvm-rtdyld/llvm-rtdyld.cpp b/tools/llvm-rtdyld/llvm-rtdyld.cpp index f626a56cbb1..462f6c17145 100644 --- a/tools/llvm-rtdyld/llvm-rtdyld.cpp +++ b/tools/llvm-rtdyld/llvm-rtdyld.cpp @@ -411,6 +411,7 @@ static int linkAndVerify() { // Instantiate a dynamic linker. TrivialMemoryManager MemMgr; RuntimeDyld Dyld(&MemMgr); + Dyld.setProcessAllSections(true); RuntimeDyldChecker Checker(Dyld, Disassembler.get(), InstPrinter.get(), llvm::dbgs()); @@ -439,6 +440,9 @@ static int linkAndVerify() { // Resolve all the relocations we can. Dyld.resolveRelocations(); + // Register EH frames. + Dyld.registerEHFrames(); + int ErrorCode = checkAllExpressions(Checker); if (Dyld.hasError()) { errs() << "RTDyld reported an error applying relocations:\n "