summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2009-03-03 20:10:23 +0000
committerChris Lattner <sabre@nondot.org>2009-03-03 20:10:23 +0000
commit7956bba54578f83ab666d8d7087d44e6692a39d5 (patch)
tree459afdf95ae81da553822fd487ec1b9d272f0d06
parent5c3529634a9a7ca34ea154b99782a7132328728f (diff)
downloadbcm5719-llvm-7956bba54578f83ab666d8d7087d44e6692a39d5.tar.gz
bcm5719-llvm-7956bba54578f83ab666d8d7087d44e6692a39d5.zip
don't #include a header into the middle of an anon namespace.
llvm-svn: 65967
-rw-r--r--llvm/lib/ExecutionEngine/JIT/JIT.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/llvm/lib/ExecutionEngine/JIT/JIT.cpp b/llvm/lib/ExecutionEngine/JIT/JIT.cpp
index a611e82585c..3fd5be7d16e 100644
--- a/llvm/lib/ExecutionEngine/JIT/JIT.cpp
+++ b/llvm/lib/ExecutionEngine/JIT/JIT.cpp
@@ -21,12 +21,12 @@
#include "llvm/ModuleProvider.h"
#include "llvm/CodeGen/MachineCodeEmitter.h"
#include "llvm/ExecutionEngine/GenericValue.h"
-#include "llvm/Support/MutexGuard.h"
-#include "llvm/System/DynamicLibrary.h"
#include "llvm/Target/TargetData.h"
#include "llvm/Target/TargetMachine.h"
#include "llvm/Target/TargetJITInfo.h"
-
+#include "llvm/Support/Dwarf.h"
+#include "llvm/Support/MutexGuard.h"
+#include "llvm/System/DynamicLibrary.h"
#include "llvm/Config/config.h"
using namespace llvm;
@@ -141,16 +141,14 @@ struct LibgccObjectInfo {
unsigned unused[2];
};
-// for DW_EH_PE_omit
-#include "llvm/Support/Dwarf.h"
-
/// darwin_register_frame - Since __register_frame does not work with darwin's
/// libgcc,we provide our own function, which "tricks" libgcc by modifying the
/// "Dwarf2 object list" key.
void DarwinRegisterFrame(void* FrameBegin) {
// Get the key.
- struct LibgccObjectInfo* LOI = (struct LibgccObjectInfo*)
+ LibgccObjectInfo* LOI = (struct LibgccObjectInfo*)
_keymgr_get_and_lock_processwide_ptr(KEYMGR_GCC3_DW2_OBJ_LIST);
+ assert(LOI && "This should be preallocated by the runtime");
// Allocate a new LibgccObject to represent this frame. Deallocation of this
// object may be impossible: since darwin code in libgcc was written after
OpenPOWER on IntegriCloud