<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"><div id="cid:FC284D77-F48F-4329-9BD0-4A38E6138746@apple.com"></div><div><br></div><div><div id="cid:FC284D77-F48F-4329-9BD0-4A38E6138746@apple.com"><br></div><div id="cid:FC284D77-F48F-4329-9BD0-4A38E6138746@apple.com">On May 1, 2013, at 3:31 PM, "Kaylor, Andrew" <<a href="mailto:andrew.kaylor@intel.com">andrew.kaylor@intel.com</a>> wrote:</div><div><br class="Apple-interchange-newline"><blockquote type="cite"><div style="letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;">I see you have commit access now. :-)<br><br>Feel free to commit your other patch whenever you have it ready. I'll give it a final review after commit, but I don't expect you'll have to change anything significant.<br><br>-Andy<br><br>-----Original Message-----<br>From: <a href="mailto:llvm-commits-bounces@cs.uiuc.edu">llvm-commits-bounces@cs.uiuc.edu</a> [<a href="mailto:llvm-commits-bounces@cs.uiuc.edu">mailto:llvm-commits-bounces@cs.uiuc.edu</a>] On Behalf Of Filip Pizlo<br>Sent: Wednesday, May 01, 2013 1:59 PM<br>To: <a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>Subject: [llvm] r180881 - This patch breaks up Wrap.h so that it does not have to include all of<br><br>Author: fpizlo<br>Date: Wed May 1 15:59:00 2013<br>New Revision: 180881<br><br>URL: <a href="http://llvm.org/viewvc/llvm-project?rev=180881&view=rev">http://llvm.org/viewvc/llvm-project?rev=180881&view=rev</a><br>Log:<br>This patch breaks up Wrap.h so that it does not have to include all of the things, and renames it to CBindingWrapping.h. I also moved CBindingWrapping.h into Support/.<br><br>This new file just contains the macros for defining different wrap/unwrap methods.<br><br>The calls to those macros, as well as any custom wrap/unwrap definitions (like for array of Values for example), are put into corresponding C++ headers.<br><br>Doing this required some #include surgery, since some .cpp files relied on the fact that including Wrap.h implicitly caused the inclusion of a bunch of other things.<br><br>This also now means that the C++ headers will include their corresponding C API headers; for example Value.h must include llvm-c/Core.h. I think this is harmless, since the C API headers contain just external function declarations and some C types, so I don't believe there should be any nasty dependency issues here.<br><br><br>Added:<br> llvm/trunk/include/llvm/Support/CBindingWrapping.h<br>Removed:<br> llvm/trunk/include/llvm/Wrap.h<br>Modified:<br> llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h<br> llvm/trunk/include/llvm/IR/BasicBlock.h<br> llvm/trunk/include/llvm/IR/IRBuilder.h<br> llvm/trunk/include/llvm/IR/LLVMContext.h<br> llvm/trunk/include/llvm/IR/Module.h<br> llvm/trunk/include/llvm/IR/Type.h<br> llvm/trunk/include/llvm/IR/Use.h<br> llvm/trunk/include/llvm/IR/Value.h<br> llvm/trunk/include/llvm/PassManager.h<br> llvm/trunk/include/llvm/PassRegistry.h<br> llvm/trunk/include/llvm/Support/MemoryBuffer.h<br> llvm/trunk/lib/Analysis/Analysis.cpp<br> llvm/trunk/lib/Analysis/IPA/IPA.cpp<br> llvm/trunk/lib/Bitcode/Reader/BitReader.cpp<br> llvm/trunk/lib/Bitcode/Writer/BitWriter.cpp<br> llvm/trunk/lib/CodeGen/CodeGen.cpp<br> llvm/trunk/lib/ExecutionEngine/ExecutionEngineBindings.cpp<br> llvm/trunk/lib/IR/Core.cpp<br> llvm/trunk/lib/Linker/LinkModules.cpp<br> llvm/trunk/lib/Object/Object.cpp<br> llvm/trunk/lib/Target/Target.cpp<br> llvm/trunk/lib/Target/TargetMachineC.cpp<br> llvm/trunk/lib/Transforms/IPO/IPO.cpp<br> llvm/trunk/lib/Transforms/IPO/PassManagerBuilder.cpp<br> llvm/trunk/lib/Transforms/InstCombine/InstructionCombining.cpp<br> llvm/trunk/lib/Transforms/Instrumentation/Instrumentation.cpp<br> llvm/trunk/lib/Transforms/ObjCARC/ObjCARC.cpp<br> llvm/trunk/lib/Transforms/Scalar/Scalar.cpp<br> llvm/trunk/lib/Transforms/Utils/Utils.cpp<br> llvm/trunk/lib/Transforms/Vectorize/Vectorize.cpp<br><br>Modified: llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h (original)<br>+++ llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h Wed May 1<span class="Apple-converted-space"> </span><br>+++ 15:59:00 2013<br>@@ -26,7 +26,6 @@<br>#include "llvm/Support/ValueHandle.h"<br>#include "llvm/Target/TargetMachine.h"<br>#include "llvm/Target/TargetOptions.h"<br>-#include "llvm/Wrap.h"<br>#include <map><br>#include <string><br>#include <vector><br>@@ -634,7 +633,8 @@ public:<br> ExecutionEngine *create(TargetMachine *TM); };<br><br>-DEFINE_SIMPLE_CONVERSION_FUNCTIONS(ExecutionEngine, LLVMExecutionEngineRef)<br>+// Create wrappers for C Binding types (see CBindingWrapping.h).<br>+DEFINE_SIMPLE_CONVERSION_FUNCTIONS(ExecutionEngine,<span class="Apple-converted-space"> </span><br>+LLVMExecutionEngineRef)<br><br>} // End llvm namespace<br><br><br>Modified: llvm/trunk/include/llvm/IR/BasicBlock.h<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/BasicBlock.h?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/BasicBlock.h?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/include/llvm/IR/BasicBlock.h (original)<br>+++ llvm/trunk/include/llvm/IR/BasicBlock.h Wed May 1 15:59:00 2013<br>@@ -18,6 +18,7 @@<br>#include "llvm/ADT/ilist.h"<br>#include "llvm/IR/Instruction.h"<br>#include "llvm/IR/SymbolTableListTraits.h"<br>+#include "llvm/Support/CBindingWrapping.h"<br>#include "llvm/Support/DataTypes.h"<br><br>namespace llvm {<br>@@ -298,6 +299,9 @@ private:<br> }<br>};<br><br>+// Create wrappers for C Binding types (see CBindingWrapping.h).<br>+DEFINE_SIMPLE_CONVERSION_FUNCTIONS(BasicBlock, LLVMBasicBlockRef)<br>+<br>} // End llvm namespace<br><br>#endif<br><br>Modified: llvm/trunk/include/llvm/IR/IRBuilder.h<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/IRBuilder.h?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/IRBuilder.h?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/include/llvm/IR/IRBuilder.h (original)<br>+++ llvm/trunk/include/llvm/IR/IRBuilder.h Wed May 1 15:59:00 2013<br>@@ -23,6 +23,7 @@<br>#include "llvm/IR/Instructions.h"<br>#include "llvm/IR/LLVMContext.h"<br>#include "llvm/IR/Operator.h"<br>+#include "llvm/Support/CBindingWrapping.h"<br>#include "llvm/Support/ConstantFolder.h"<br><br>namespace llvm {<br>@@ -1396,6 +1397,9 @@ public:<br> }<br>};<br><br>+// Create wrappers for C Binding types (see CBindingWrapping.h).<br>+DEFINE_SIMPLE_CONVERSION_FUNCTIONS(IRBuilder<>, LLVMBuilderRef)<br>+<br>}<br><br>#endif<br><br>Modified: llvm/trunk/include/llvm/IR/LLVMContext.h<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/LLVMContext.h?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/LLVMContext.h?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/include/llvm/IR/LLVMContext.h (original)<br>+++ llvm/trunk/include/llvm/IR/LLVMContext.h Wed May 1 15:59:00 2013<br>@@ -15,7 +15,9 @@<br>#ifndef LLVM_IR_LLVMCONTEXT_H<br>#define LLVM_IR_LLVMCONTEXT_H<br><br>+#include "llvm/Support/CBindingWrapping.h"<br>#include "llvm/Support/Compiler.h"<br>+#include "llvm-c/Core.h"<br><br>namespace llvm {<br><br>@@ -109,6 +111,19 @@ private:<br>/// only care about operating on a single thread.<br>extern LLVMContext &getGlobalContext();<br><br>+// Create wrappers for C Binding types (see CBindingWrapping.h).<br>+DEFINE_SIMPLE_CONVERSION_FUNCTIONS(LLVMContext, LLVMContextRef)<br>+<br>+/* Specialized opaque context conversions.<br>+ */<br>+inline LLVMContext **unwrap(LLVMContextRef* Tys) {<br>+ return reinterpret_cast<LLVMContext**>(Tys);<br>+}<br>+<br>+inline LLVMContextRef *wrap(const LLVMContext **Tys) {<br>+ return<span class="Apple-converted-space"> </span><br>+reinterpret_cast<LLVMContextRef*>(const_cast<LLVMContext**>(Tys));<br>+}<br>+<br>}<br><br>#endif<br><br>Modified: llvm/trunk/include/llvm/IR/Module.h<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/Module.h?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/Module.h?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/include/llvm/IR/Module.h (original)<br>+++ llvm/trunk/include/llvm/IR/Module.h Wed May 1 15:59:00 2013<br>@@ -20,6 +20,7 @@<br>#include "llvm/IR/GlobalAlias.h"<br>#include "llvm/IR/GlobalVariable.h"<br>#include "llvm/IR/Metadata.h"<br>+#include "llvm/Support/CBindingWrapping.h"<br>#include "llvm/Support/DataTypes.h"<br><br>namespace llvm {<br>@@ -584,6 +585,16 @@ inline raw_ostream &operator<<(raw_ostre<br> return O;<br>}<br><br>+// Create wrappers for C Binding types (see CBindingWrapping.h).<br>+DEFINE_SIMPLE_CONVERSION_FUNCTIONS(Module, LLVMModuleRef)<br>+<br>+/* LLVMModuleProviderRef exists for historical reasons, but now just<span class="Apple-converted-space"> </span><br>+holds a<br>+ * Module.<br>+ */<br>+inline Module *unwrap(LLVMModuleProviderRef MP) {<br>+ return reinterpret_cast<Module*>(MP); }<br>+ <br>} // End llvm namespace<br><br>#endif<br><br>Modified: llvm/trunk/include/llvm/IR/Type.h<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/Type.h?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/Type.h?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/include/llvm/IR/Type.h (original)<br>+++ llvm/trunk/include/llvm/IR/Type.h Wed May 1 15:59:00 2013<br>@@ -17,8 +17,10 @@<br><br>#include "llvm/ADT/APFloat.h"<br>#include "llvm/Support/Casting.h"<br>+#include "llvm/Support/CBindingWrapping.h"<br>#include "llvm/Support/DataTypes.h"<br>#include "llvm/Support/ErrorHandling.h"<br>+#include "llvm-c/Core.h"<br><br>namespace llvm {<br><br>@@ -467,6 +469,19 @@ template <> struct GraphTraits<const Typ<br> }<br>};<br><br>+// Create wrappers for C Binding types (see CBindingWrapping.h).<br>+DEFINE_ISA_CONVERSION_FUNCTIONS(Type, LLVMTypeRef)<br>+<br>+/* Specialized opaque type conversions.<br>+ */<br>+inline Type **unwrap(LLVMTypeRef* Tys) {<br>+ return reinterpret_cast<Type**>(Tys); }<br>+<br>+inline LLVMTypeRef *wrap(Type **Tys) {<br>+ return reinterpret_cast<LLVMTypeRef*>(const_cast<Type**>(Tys));<br>+}<br>+ <br>} // End llvm namespace<br><br>#endif<br><br>Modified: llvm/trunk/include/llvm/IR/Use.h<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/Use.h?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/Use.h?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/include/llvm/IR/Use.h (original)<br>+++ llvm/trunk/include/llvm/IR/Use.h Wed May 1 15:59:00 2013<br>@@ -26,7 +26,9 @@<br>#define LLVM_IR_USE_H<br><br>#include "llvm/ADT/PointerIntPair.h"<br>+#include "llvm/Support/CBindingWrapping.h"<br>#include "llvm/Support/Compiler.h"<br>+#include "llvm-c/Core.h"<br>#include <cstddef><br>#include <iterator><br><br>@@ -214,6 +216,9 @@ public:<br> unsigned getOperandNo() const;<br>};<br><br>+// Create wrappers for C Binding types (see CBindingWrapping.h).<br>+DEFINE_SIMPLE_CONVERSION_FUNCTIONS(Use, LLVMUseRef)<br>+<br>} // End llvm namespace<br><br>#endif<br><br>Modified: llvm/trunk/include/llvm/IR/Value.h<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/Value.h?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/Value.h?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/include/llvm/IR/Value.h (original)<br>+++ llvm/trunk/include/llvm/IR/Value.h Wed May 1 15:59:00 2013<br>@@ -16,7 +16,9 @@<br><br>#include "llvm/IR/Use.h"<br>#include "llvm/Support/Casting.h"<br>+#include "llvm/Support/CBindingWrapping.h"<br>#include "llvm/Support/Compiler.h"<br>+#include "llvm-c/Core.h"<br><br>namespace llvm {<br><br>@@ -406,6 +408,29 @@ public:<br> enum { NumLowBitsAvailable = 2 };<br>};<br><br>+// Create wrappers for C Binding types (see CBindingWrapping.h).<br>+DEFINE_ISA_CONVERSION_FUNCTIONS(Value, LLVMValueRef)<br>+<br>+/* Specialized opaque value conversions.<br>+ */<br>+inline Value **unwrap(LLVMValueRef *Vals) {<br>+ return reinterpret_cast<Value**>(Vals); }<br>+<br>+template<typename T><br>+inline T **unwrap(LLVMValueRef *Vals, unsigned Length) { #ifdef DEBUG<br>+ for (LLVMValueRef *I = Vals, *E = Vals + Length; I != E; ++I)<br>+ cast<T>(*I);<br>+#endif<br>+ (void)Length;<br>+ return reinterpret_cast<T**>(Vals);<br>+}<br>+<br>+inline LLVMValueRef *wrap(const Value **Vals) {<br>+ return reinterpret_cast<LLVMValueRef*>(const_cast<Value**>(Vals));<br>+}<br>+<br>} // End llvm namespace<br><br>#endif<br><br>Modified: llvm/trunk/include/llvm/PassManager.h<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/PassManager.h?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/PassManager.h?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/include/llvm/PassManager.h (original)<br>+++ llvm/trunk/include/llvm/PassManager.h Wed May 1 15:59:00 2013<br>@@ -18,6 +18,7 @@<br>#define LLVM_PASSMANAGER_H<br><br>#include "llvm/Pass.h"<br>+#include "llvm/Support/CBindingWrapping.h"<br><br>namespace llvm {<br><br>@@ -98,6 +99,9 @@ private:<br> Module *M;<br>};<br><br>+// Create wrappers for C Binding types (see CBindingWrapping.h).<br>+DEFINE_STDCXX_CONVERSION_FUNCTIONS(PassManagerBase, LLVMPassManagerRef)<br>+<br>} // End llvm namespace<br><br>#endif<br><br>Modified: llvm/trunk/include/llvm/PassRegistry.h<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/PassRegistry.h?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/PassRegistry.h?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/include/llvm/PassRegistry.h (original)<br>+++ llvm/trunk/include/llvm/PassRegistry.h Wed May 1 15:59:00 2013<br>@@ -18,6 +18,8 @@<br>#define LLVM_PASSREGISTRY_H<br><br>#include "llvm/ADT/StringRef.h"<br>+#include "llvm/Support/CBindingWrapping.h"<br>+#include "llvm-c/Core.h"<br><br>namespace llvm {<br><br>@@ -79,6 +81,9 @@ public:<br> void removeRegistrationListener(PassRegistrationListener *L); };<br><br>+// Create wrappers for C Binding types (see CBindingWrapping.h).<br>+DEFINE_STDCXX_CONVERSION_FUNCTIONS(PassRegistry, LLVMPassRegistryRef)<br>+<br>}<br><br>#endif<br><br>Added: llvm/trunk/include/llvm/Support/CBindingWrapping.h<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/CBindingWrapping.h?rev=180881&view=auto">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/CBindingWrapping.h?rev=180881&view=auto</a><br>==============================================================================<br>--- llvm/trunk/include/llvm/Support/CBindingWrapping.h (added)<br>+++ llvm/trunk/include/llvm/Support/CBindingWrapping.h Wed May 1<span class="Apple-converted-space"> </span><br>+++ 15:59:00 2013<br>@@ -0,0 +1,46 @@<br>+//===- llvm/Wrap.h - C++ Type Wrapping for the C Interface -----*- C++<span class="Apple-converted-space"> </span><br>+-*-===// //<br>+// The LLVM Compiler Infrastructure<br>+//<br>+// This file is distributed under the University of Illinois Open<span class="Apple-converted-space"> </span><br>+Source // License. See LICENSE.TXT for details.<br>+//<br>+//===------------------------------------------------------------------<br>+----===//<br>+//<br>+// This file declares the wrapping macros for the C interface.<br>+//<br>+//===------------------------------------------------------------------<br>+----===//<br>+<br>+#ifndef LLVM_C_BINDING_WRAPPING_H<br>+#define LLVM_C_BINDING_WRAPPING_H<br>+<br>+#include "llvm/Support/Casting.h"<br>+<br>+#define DEFINE_SIMPLE_CONVERSION_FUNCTIONS(ty, ref) \<br>+ inline ty *unwrap(ref P) { \<br>+ return reinterpret_cast<ty*>(P); \<br>+ } \<br>+ \<br>+ inline ref wrap(const ty *P) { \<br>+ return reinterpret_cast<ref>(const_cast<ty*>(P)); \<br>+ }<br>+<br>+#define DEFINE_ISA_CONVERSION_FUNCTIONS(ty, ref) \<br>+ DEFINE_SIMPLE_CONVERSION_FUNCTIONS(ty, ref) \<br>+ \<br>+ template<typename T> \<br>+ inline T *unwrap(ref P) { \<br>+ return cast<T>(unwrap(P)); \<br>+ }<br>+<br>+#define DEFINE_STDCXX_CONVERSION_FUNCTIONS(ty, ref) \<br>+ DEFINE_SIMPLE_CONVERSION_FUNCTIONS(ty, ref) \<br>+ \<br>+ template<typename T> \<br>+ inline T *unwrap(ref P) { \<br>+ T *Q = (T*)unwrap(P); \<br>+ assert(Q && "Invalid cast!"); \<br>+ return Q; \<br>+ }<br>+<br>+#endif<br><br>Modified: llvm/trunk/include/llvm/Support/MemoryBuffer.h<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/MemoryBuffer.h?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/MemoryBuffer.h?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/include/llvm/Support/MemoryBuffer.h (original)<br>+++ llvm/trunk/include/llvm/Support/MemoryBuffer.h Wed May 1 15:59:00<span class="Apple-converted-space"> </span><br>+++ 2013<br>@@ -15,8 +15,10 @@<br>#define LLVM_SUPPORT_MEMORYBUFFER_H<br><br>#include "llvm/ADT/StringRef.h"<br>+#include "llvm/Support/CBindingWrapping.h"<br>#include "llvm/Support/Compiler.h"<br>#include "llvm/Support/DataTypes.h"<br>+#include "llvm-c/Core.h"<br><br>namespace llvm {<br><br>@@ -137,6 +139,9 @@ public:<br> virtual BufferKind getBufferKind() const = 0; };<br><br>+// Create wrappers for C Binding types (see CBindingWrapping.h).<br>+DEFINE_SIMPLE_CONVERSION_FUNCTIONS(MemoryBuffer, LLVMMemoryBufferRef)<br>+<br>} // end namespace llvm<br><br>#endif<br><br>Removed: llvm/trunk/include/llvm/Wrap.h<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Wrap.h?rev=180880&view=auto">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Wrap.h?rev=180880&view=auto</a><br>==============================================================================<br>--- llvm/trunk/include/llvm/Wrap.h (original)<br>+++ llvm/trunk/include/llvm/Wrap.h (removed)<br>@@ -1,124 +0,0 @@<br>-//===- llvm/Wrap.h - C++ Type Wrapping for the C Interface -----*- C++ -*-===// -//<br>-// The LLVM Compiler Infrastructure<br>-//<br>-// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details.<br>-//<br>-//===----------------------------------------------------------------------===//<br>-//<br>-// This file declares the wrapping functions for the C interface.<br>-//<br>-//===----------------------------------------------------------------------===//<br>-<br>-#ifndef LLVM_WRAP_H<br>-#define LLVM_WRAP_H<br>-<br>-#include "llvm-c/Core.h"<br>-#include "llvm/IR/BasicBlock.h"<br>-#include "llvm/IR/IRBuilder.h"<br>-#include "llvm/IR/Module.h"<br>-#include "llvm/IR/Type.h"<br>-#include "llvm/PassRegistry.h"<br>-<br>-/* When included into a C++ source file, also declares 'wrap' and 'unwrap'<br>- helpers to perform opaque reference<-->pointer conversions. These helpers<br>- are shorter and more tightly typed than writing the casts by hand when<br>- authoring bindings. In assert builds, they will do runtime type checking.<br>-<br>- Need these includes to support the LLVM 'cast' template for the C++ 'wrap'<span class="Apple-converted-space"> </span><br>- and 'unwrap' conversion functions. */<br>-<br>-namespace llvm {<br>- class MemoryBuffer;<br>- class PassManagerBase;<br>- struct GenericValue;<br>- class ExecutionEngine;<br>-<br>- #define DEFINE_SIMPLE_CONVERSION_FUNCTIONS(ty, ref) \<br>- inline ty *unwrap(ref P) { \<br>- return reinterpret_cast<ty*>(P); \<br>- } \<br>- \<br>- inline ref wrap(const ty *P) { \<br>- return reinterpret_cast<ref>(const_cast<ty*>(P)); \<br>- }<br>- <br>- #define DEFINE_ISA_CONVERSION_FUNCTIONS(ty, ref) \<br>- DEFINE_SIMPLE_CONVERSION_FUNCTIONS(ty, ref) \<br>- \<br>- template<typename T> \<br>- inline T *unwrap(ref P) { \<br>- return cast<T>(unwrap(P)); \<br>- }<br>- <br>- #define DEFINE_STDCXX_CONVERSION_FUNCTIONS(ty, ref) \<br>- DEFINE_SIMPLE_CONVERSION_FUNCTIONS(ty, ref) \<br>- \<br>- template<typename T> \<br>- inline T *unwrap(ref P) { \<br>- T *Q = (T*)unwrap(P); \<br>- assert(Q && "Invalid cast!"); \<br>- return Q; \<br>- }<br>- <br>- DEFINE_ISA_CONVERSION_FUNCTIONS (Type, LLVMTypeRef )<br>- DEFINE_ISA_CONVERSION_FUNCTIONS (Value, LLVMValueRef )<br>- DEFINE_SIMPLE_CONVERSION_FUNCTIONS(Module, LLVMModuleRef )<br>- DEFINE_SIMPLE_CONVERSION_FUNCTIONS(BasicBlock, LLVMBasicBlockRef )<br>- DEFINE_SIMPLE_CONVERSION_FUNCTIONS(IRBuilder<>, LLVMBuilderRef )<br>- DEFINE_SIMPLE_CONVERSION_FUNCTIONS(MemoryBuffer, LLVMMemoryBufferRef )<br>- DEFINE_SIMPLE_CONVERSION_FUNCTIONS(LLVMContext, LLVMContextRef )<br>- DEFINE_SIMPLE_CONVERSION_FUNCTIONS(Use, LLVMUseRef )<br>- DEFINE_STDCXX_CONVERSION_FUNCTIONS(PassManagerBase, LLVMPassManagerRef )<br>- DEFINE_STDCXX_CONVERSION_FUNCTIONS(PassRegistry, LLVMPassRegistryRef )<br>-<br>- /* LLVMModuleProviderRef exists for historical reasons, but now just holds a<br>- * Module.<br>- */<br>- inline Module *unwrap(LLVMModuleProviderRef MP) {<br>- return reinterpret_cast<Module*>(MP);<br>- }<br>-<br>- /* Specialized opaque context conversions.<br>- */<br>- inline LLVMContext **unwrap(LLVMContextRef* Tys) {<br>- return reinterpret_cast<LLVMContext**>(Tys);<br>- }<br>-<br>- inline LLVMContextRef *wrap(const LLVMContext **Tys) {<br>- return reinterpret_cast<LLVMContextRef*>(const_cast<LLVMContext**>(Tys));<br>- }<br>-<br>- /* Specialized opaque type conversions.<br>- */<br>- inline Type **unwrap(LLVMTypeRef* Tys) {<br>- return reinterpret_cast<Type**>(Tys);<br>- }<br>-<br>- inline LLVMTypeRef *wrap(Type **Tys) {<br>- return reinterpret_cast<LLVMTypeRef*>(const_cast<Type**>(Tys));<br>- }<br>-<br>- /* Specialized opaque value conversions.<br>- */<span class="Apple-converted-space"> </span><br>- inline Value **unwrap(LLVMValueRef *Vals) {<br>- return reinterpret_cast<Value**>(Vals);<br>- }<br>-<br>- template<typename T><br>- inline T **unwrap(LLVMValueRef *Vals, unsigned Length) {<br>- #ifdef DEBUG<br>- for (LLVMValueRef *I = Vals, *E = Vals + Length; I != E; ++I)<br>- cast<T>(*I);<br>- #endif<br>- (void)Length;<br>- return reinterpret_cast<T**>(Vals);<br>- }<br>-<br>- inline LLVMValueRef *wrap(const Value **Vals) {<br>- return reinterpret_cast<LLVMValueRef*>(const_cast<Value**>(Vals));<br>- }<br>-}<br>-<br>-#endif<br><br>Modified: llvm/trunk/lib/Analysis/Analysis.cpp<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/Analysis.cpp?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/Analysis.cpp?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/lib/Analysis/Analysis.cpp (original)<br>+++ llvm/trunk/lib/Analysis/Analysis.cpp Wed May 1 15:59:00 2013<br>@@ -9,9 +9,10 @@<br><br>#include "llvm-c/Analysis.h"<br>#include "llvm-c/Initialization.h"<br>-#include "llvm/Wrap.h"<br>#include "llvm/Analysis/Verifier.h"<br>#include "llvm/InitializePasses.h"<br>+#include "llvm/IR/Module.h"<br>+#include "llvm/PassRegistry.h"<br>#include <cstring><br><br>using namespace llvm;<br><br>Modified: llvm/trunk/lib/Analysis/IPA/IPA.cpp<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/IPA/IPA.cpp?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/IPA/IPA.cpp?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/lib/Analysis/IPA/IPA.cpp (original)<br>+++ llvm/trunk/lib/Analysis/IPA/IPA.cpp Wed May 1 15:59:00 2013<br>@@ -12,7 +12,7 @@<br>//===----------------------------------------------------------------------===//<br><br>#include "llvm/InitializePasses.h"<br>-#include "llvm/Wrap.h"<br>+#include "llvm/PassRegistry.h"<br>#include "llvm-c/Initialization.h"<br><br>using namespace llvm;<br><br>Modified: llvm/trunk/lib/Bitcode/Reader/BitReader.cpp<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitReader.cpp?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitReader.cpp?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/lib/Bitcode/Reader/BitReader.cpp (original)<br>+++ llvm/trunk/lib/Bitcode/Reader/BitReader.cpp Wed May 1 15:59:00 2013<br>@@ -8,9 +8,9 @@<br>//===----------------------------------------------------------------------===//<br><br>#include "llvm-c/BitReader.h"<br>-#include "llvm/Wrap.h"<br>#include "llvm/Bitcode/ReaderWriter.h"<br>#include "llvm/IR/LLVMContext.h"<br>+#include "llvm/IR/Module.h"<br>#include "llvm/Support/MemoryBuffer.h"<br>#include <cstring><br>#include <string><br><br>Modified: llvm/trunk/lib/Bitcode/Writer/BitWriter.cpp<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitWriter.cpp?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitWriter.cpp?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/lib/Bitcode/Writer/BitWriter.cpp (original)<br>+++ llvm/trunk/lib/Bitcode/Writer/BitWriter.cpp Wed May 1 15:59:00 2013<br>@@ -8,8 +8,8 @@<br>//===----------------------------------------------------------------------===//<br><br>#include "llvm-c/BitWriter.h"<br>-#include "llvm/Wrap.h"<br>#include "llvm/Bitcode/ReaderWriter.h"<br>+#include "llvm/IR/Module.h"<br>#include "llvm/Support/raw_ostream.h"<br>using namespace llvm;<br><br><br>Modified: llvm/trunk/lib/CodeGen/CodeGen.cpp<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/CodeGen.cpp?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/CodeGen.cpp?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/lib/CodeGen/CodeGen.cpp (original)<br>+++ llvm/trunk/lib/CodeGen/CodeGen.cpp Wed May 1 15:59:00 2013<br>@@ -13,7 +13,7 @@<br>//===----------------------------------------------------------------------===//<br><br>#include "llvm/InitializePasses.h"<br>-#include "llvm/Wrap.h"<br>+#include "llvm/PassRegistry.h"<br>#include "llvm-c/Initialization.h"<br><br>using namespace llvm;<br><br>Modified: llvm/trunk/lib/ExecutionEngine/ExecutionEngineBindings.cpp<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/ExecutionEngineBindings.cpp?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/ExecutionEngineBindings.cpp?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/lib/ExecutionEngine/ExecutionEngineBindings.cpp (original)<br>+++ llvm/trunk/lib/ExecutionEngine/ExecutionEngineBindings.cpp Wed May <br>+++ 1 15:59:00 2013<br>@@ -15,13 +15,15 @@<br>#include "llvm-c/ExecutionEngine.h"<br>#include "llvm/ExecutionEngine/ExecutionEngine.h"<br>#include "llvm/ExecutionEngine/GenericValue.h"<br>+#include "llvm/IR/DerivedTypes.h"<br>+#include "llvm/IR/Module.h"<br>#include "llvm/Support/ErrorHandling.h"<br>#include <cstring><br><br>using namespace llvm;<br><br>// Wrapping the C bindings types.<br>-DEFINE_SIMPLE_CONVERSION_FUNCTIONS(GenericValue, LLVMGenericValueRef )<br>+DEFINE_SIMPLE_CONVERSION_FUNCTIONS(GenericValue, LLVMGenericValueRef)<br><br>inline DataLayout *unwrap(LLVMTargetDataRef P) {<br> return reinterpret_cast<DataLayout*>(P);<br><br>Modified: llvm/trunk/lib/IR/Core.cpp<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/Core.cpp?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/Core.cpp?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/lib/IR/Core.cpp (original)<br>+++ llvm/trunk/lib/IR/Core.cpp Wed May 1 15:59:00 2013<br>@@ -13,7 +13,6 @@<br>//===----------------------------------------------------------------------===//<br><br>#include "llvm-c/Core.h"<br>-#include "llvm/Wrap.h"<br>#include "llvm/Bitcode/ReaderWriter.h"<br>#include "llvm/IR/Attributes.h"<br>#include "llvm/IR/Constants.h"<br>@@ -22,7 +21,9 @@<br>#include "llvm/IR/GlobalVariable.h"<br>#include "llvm/IR/InlineAsm.h"<br>#include "llvm/IR/IntrinsicInst.h"<br>+#include "llvm/IR/IRBuilder.h"<br>#include "llvm/IR/LLVMContext.h"<br>+#include "llvm/IR/Module.h"<br>#include "llvm/PassManager.h"<br>#include "llvm/Support/CallSite.h"<br>#include "llvm/Support/Debug.h"<br><br>Modified: llvm/trunk/lib/Linker/LinkModules.cpp<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Linker/LinkModules.cpp?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Linker/LinkModules.cpp?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/lib/Linker/LinkModules.cpp (original)<br>+++ llvm/trunk/lib/Linker/LinkModules.cpp Wed May 1 15:59:00 2013<br>@@ -12,7 +12,6 @@<br>//===----------------------------------------------------------------------===//<br><br>#include "llvm/Linker.h"<br>-#include "llvm/Wrap.h"<br>#include "llvm-c/Linker.h"<br>#include "llvm/ADT/DenseSet.h"<br>#include "llvm/ADT/Optional.h"<br><br>Modified: llvm/trunk/lib/Object/Object.cpp<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/Object.cpp?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/Object.cpp?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/lib/Object/Object.cpp (original)<br>+++ llvm/trunk/lib/Object/Object.cpp Wed May 1 15:59:00 2013<br>@@ -12,9 +12,9 @@<br>//<br>//===----------------------------------------------------------------------===//<br><br>+#include "llvm/ADT/SmallVector.h"<br>#include "llvm/Object/ObjectFile.h"<br>#include "llvm-c/Object.h"<br>-#include "llvm/Wrap.h"<br><br>using namespace llvm;<br>using namespace object;<br><br>Modified: llvm/trunk/lib/Target/Target.cpp<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Target.cpp?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Target.cpp?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/lib/Target/Target.cpp (original)<br>+++ llvm/trunk/lib/Target/Target.cpp Wed May 1 15:59:00 2013<br>@@ -16,9 +16,9 @@<br>#include "llvm-c/Initialization.h"<br>#include "llvm/IR/DataLayout.h"<br>#include "llvm/IR/LLVMContext.h"<br>+#include "llvm/IR/Value.h"<br>#include "llvm/InitializePasses.h"<br>#include "llvm/PassManager.h"<br>-#include "llvm/Wrap.h"<br>#include "llvm/Target/TargetLibraryInfo.h"<br>#include <cstring><br><br><br>Modified: llvm/trunk/lib/Target/TargetMachineC.cpp<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetMachineC.cpp?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetMachineC.cpp?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/lib/Target/TargetMachineC.cpp (original)<br>+++ llvm/trunk/lib/Target/TargetMachineC.cpp Wed May 1 15:59:00 2013<br>@@ -17,7 +17,6 @@<br>#include "llvm/IR/DataLayout.h"<br>#include "llvm/IR/Module.h"<br>#include "llvm/PassManager.h"<br>-#include "llvm/Wrap.h"<br>#include "llvm/Support/CodeGen.h"<br>#include "llvm/Support/FormattedStream.h"<br>#include "llvm/Support/TargetRegistry.h"<br><br>Modified: llvm/trunk/lib/Transforms/IPO/IPO.cpp<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/IPO.cpp?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/IPO.cpp?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/lib/Transforms/IPO/IPO.cpp (original)<br>+++ llvm/trunk/lib/Transforms/IPO/IPO.cpp Wed May 1 15:59:00 2013<br>@@ -17,7 +17,6 @@<br>#include "llvm-c/Transforms/IPO.h"<br>#include "llvm/InitializePasses.h"<br>#include "llvm/PassManager.h"<br>-#include "llvm/Wrap.h"<br>#include "llvm/Transforms/IPO.h"<br><br>using namespace llvm;<br><br>Modified: llvm/trunk/lib/Transforms/IPO/PassManagerBuilder.cpp<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/PassManagerBuilder.cpp?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/PassManagerBuilder.cpp?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/lib/Transforms/IPO/PassManagerBuilder.cpp (original)<br>+++ llvm/trunk/lib/Transforms/IPO/PassManagerBuilder.cpp Wed May 1<span class="Apple-converted-space"> </span><br>+++ 15:59:00 2013<br>@@ -19,7 +19,6 @@<br>#include "llvm/Analysis/Passes.h"<br>#include "llvm/Analysis/Verifier.h"<br>#include "llvm/PassManager.h"<br>-#include "llvm/Wrap.h"<br>#include "llvm/Support/CommandLine.h"<br>#include "llvm/Support/ManagedStatic.h"<br>#include "llvm/Target/TargetLibraryInfo.h"<br><br>Modified: llvm/trunk/lib/Transforms/InstCombine/InstructionCombining.cpp<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstructionCombining.cpp?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstructionCombining.cpp?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/lib/Transforms/InstCombine/InstructionCombining.cpp (original)<br>+++ llvm/trunk/lib/Transforms/InstCombine/InstructionCombining.cpp Wed<span class="Apple-converted-space"> </span><br>+++ May 1 15:59:00 2013<br>@@ -53,7 +53,6 @@<br>#include "llvm/Support/ValueHandle.h"<br>#include "llvm/Target/TargetLibraryInfo.h"<br>#include "llvm/Transforms/Utils/Local.h"<br>-#include "llvm/Wrap.h"<br>#include <algorithm><br>#include <climits><br>using namespace llvm;<br><br>Modified: llvm/trunk/lib/Transforms/Instrumentation/Instrumentation.cpp<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/Instrumentation.cpp?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/Instrumentation.cpp?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/lib/Transforms/Instrumentation/Instrumentation.cpp (original)<br>+++ llvm/trunk/lib/Transforms/Instrumentation/Instrumentation.cpp Wed<span class="Apple-converted-space"> </span><br>+++ May 1 15:59:00 2013<br>@@ -13,7 +13,7 @@<br>//===----------------------------------------------------------------------===//<br><br>#include "llvm/InitializePasses.h"<br>-#include "llvm/Wrap.h"<br>+#include "llvm/PassRegistry.h"<br>#include "llvm-c/Initialization.h"<br><br>using namespace llvm;<br><br>Modified: llvm/trunk/lib/Transforms/ObjCARC/ObjCARC.cpp<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/ObjCARC/ObjCARC.cpp?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/ObjCARC/ObjCARC.cpp?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/lib/Transforms/ObjCARC/ObjCARC.cpp (original)<br>+++ llvm/trunk/lib/Transforms/ObjCARC/ObjCARC.cpp Wed May 1 15:59:00<span class="Apple-converted-space"> </span><br>+++ 2013<br>@@ -17,7 +17,6 @@<br>#include "llvm-c/Core.h"<br>#include "llvm-c/Initialization.h"<br>#include "llvm/InitializePasses.h"<br>-#include "llvm/Wrap.h"<br>#include "llvm/Support/CommandLine.h"<br><br>namespace llvm {<br><br>Modified: llvm/trunk/lib/Transforms/Scalar/Scalar.cpp<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/Scalar.cpp?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/Scalar.cpp?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/lib/Transforms/Scalar/Scalar.cpp (original)<br>+++ llvm/trunk/lib/Transforms/Scalar/Scalar.cpp Wed May 1 15:59:00 2013<br>@@ -21,7 +21,6 @@<br>#include "llvm/IR/DataLayout.h"<br>#include "llvm/InitializePasses.h"<br>#include "llvm/PassManager.h"<br>-#include "llvm/Wrap.h"<br><br>using namespace llvm;<br><br><br>Modified: llvm/trunk/lib/Transforms/Utils/Utils.cpp<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/Utils.cpp?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/Utils.cpp?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/lib/Transforms/Utils/Utils.cpp (original)<br>+++ llvm/trunk/lib/Transforms/Utils/Utils.cpp Wed May 1 15:59:00 2013<br>@@ -13,7 +13,7 @@<br>//===----------------------------------------------------------------------===//<br><br>#include "llvm/InitializePasses.h"<br>-#include "llvm/Wrap.h"<br>+#include "llvm/PassRegistry.h"<br>#include "llvm-c/Initialization.h"<br><br>using namespace llvm;<br><br>Modified: llvm/trunk/lib/Transforms/Vectorize/Vectorize.cpp<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Vectorize/Vectorize.cpp?rev=180881&r1=180880&r2=180881&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Vectorize/Vectorize.cpp?rev=180881&r1=180880&r2=180881&view=diff</a><br>==============================================================================<br>--- llvm/trunk/lib/Transforms/Vectorize/Vectorize.cpp (original)<br>+++ llvm/trunk/lib/Transforms/Vectorize/Vectorize.cpp Wed May 1<span class="Apple-converted-space"> </span><br>+++ 15:59:00 2013<br>@@ -20,7 +20,6 @@<br>#include "llvm/Analysis/Verifier.h"<br>#include "llvm/InitializePasses.h"<br>#include "llvm/PassManager.h"<br>-#include "llvm/Wrap.h"<br><br>using namespace llvm;<br><br><br><br>_______________________________________________<br>llvm-commits mailing list<br><a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</div></blockquote></div><br></div></body></html>