[llvm] r180157 - Fix dependency layering issues caused by r180112.
Eric Christopher
echristo at gmail.com
Tue Apr 23 15:53:53 PDT 2013
Author: echristo
Date: Tue Apr 23 17:53:53 2013
New Revision: 180157
URL: http://llvm.org/viewvc/llvm-project?rev=180157&view=rev
Log:
Fix dependency layering issues caused by r180112.
Patch by Tom Stellard. (Committed while he's afk per request)
Modified:
llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h
llvm/trunk/include/llvm/Wrap.h
llvm/trunk/lib/ExecutionEngine/ExecutionEngineBindings.cpp
Modified: llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h?rev=180157&r1=180156&r2=180157&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h (original)
+++ llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h Tue Apr 23 17:53:53 2013
@@ -15,6 +15,7 @@
#ifndef LLVM_EXECUTIONENGINE_EXECUTIONENGINE_H
#define LLVM_EXECUTIONENGINE_EXECUTIONENGINE_H
+#include "llvm-c/ExecutionEngine.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
@@ -25,6 +26,7 @@
#include "llvm/Support/ValueHandle.h"
#include "llvm/Target/TargetMachine.h"
#include "llvm/Target/TargetOptions.h"
+#include "llvm/Wrap.h"
#include <map>
#include <string>
#include <vector>
@@ -632,6 +634,8 @@ public:
ExecutionEngine *create(TargetMachine *TM);
};
+DEFINE_SIMPLE_CONVERSION_FUNCTIONS(ExecutionEngine, LLVMExecutionEngineRef)
+
} // End llvm namespace
#endif
Modified: llvm/trunk/include/llvm/Wrap.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Wrap.h?rev=180157&r1=180156&r2=180157&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Wrap.h (original)
+++ llvm/trunk/include/llvm/Wrap.h Tue Apr 23 17:53:53 2013
@@ -12,7 +12,6 @@
//===----------------------------------------------------------------------===//
#include "llvm-c/Core.h"
-#include "llvm-c/ExecutionEngine.h"
#include "llvm/IR/BasicBlock.h"
#include "llvm/IR/IRBuilder.h"
#include "llvm/IR/Module.h"
@@ -68,7 +67,6 @@ namespace llvm {
DEFINE_SIMPLE_CONVERSION_FUNCTIONS(MemoryBuffer, LLVMMemoryBufferRef )
DEFINE_SIMPLE_CONVERSION_FUNCTIONS(LLVMContext, LLVMContextRef )
DEFINE_SIMPLE_CONVERSION_FUNCTIONS(Use, LLVMUseRef )
- DEFINE_SIMPLE_CONVERSION_FUNCTIONS(ExecutionEngine, LLVMExecutionEngineRef)
DEFINE_STDCXX_CONVERSION_FUNCTIONS(PassManagerBase, LLVMPassManagerRef )
DEFINE_STDCXX_CONVERSION_FUNCTIONS(PassRegistry, LLVMPassRegistryRef )
Modified: llvm/trunk/lib/ExecutionEngine/ExecutionEngineBindings.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/ExecutionEngineBindings.cpp?rev=180157&r1=180156&r2=180157&view=diff
==============================================================================
--- llvm/trunk/lib/ExecutionEngine/ExecutionEngineBindings.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/ExecutionEngineBindings.cpp Tue Apr 23 17:53:53 2013
@@ -16,7 +16,6 @@
#include "llvm/ExecutionEngine/ExecutionEngine.h"
#include "llvm/ExecutionEngine/GenericValue.h"
#include "llvm/Support/ErrorHandling.h"
-#include "llvm/Wrap.h"
#include <cstring>
using namespace llvm;
More information about the llvm-commits
mailing list