Ticket #46831: patch-llvm-3.3svn.diff

File patch-llvm-3.3svn.diff, 24.2 KB (added by Schamschula (Marius Schamschula), 10 years ago)

  • OpenCTL/OpenCTL/compiler/Compiler.cpp 

    diff -up OpenCTL/OpenCTL/compiler/Compiler.cpp.jx OpenCTL/OpenCTL/compiler/Compiler.cpp
    old new  
    2727#include <climits>
    2828
    2929// LLVM
    30 #include <llvm/InstrTypes.h>
     30#include <llvm/IR/InstrTypes.h>
    3131// #include <llvm/Linker.h>
    32 #include <llvm/DerivedTypes.h>
    33 #include <llvm/Module.h>
     32#include <llvm/IR/DerivedTypes.h>
     33#include <llvm/IR/Module.h>
    3434// #include <llvm/Transforms/Utils/Cloning.h>
    3535// Library Loader
    3636#ifdef LLVM_27_OR_28
    … … bool Compiler::compile(bool _isStandardL 
    214214  return success;
    215215}
    216216
    217 #include <llvm/ValueSymbolTable.h>
     217#include <llvm/IR/ValueSymbolTable.h>
    218218
    219219bool Compiler::importModule(const GTLCore::String& name)
    220220{

  • OpenCTL/OpenCTL/compiler/ParserNG.cpp 

    diff -up OpenCTL/OpenCTL/compiler/ParserNG.cpp.jx OpenCTL/OpenCTL/compiler/ParserNG.cpp
    old new  
    1919
    2020#include "ParserNG.h"
    2121
    22 #include <llvm/Constants.h>
    23 #include <llvm/DerivedTypes.h>
    24 #include <llvm/Type.h>
     22#include <llvm/IR/Constants.h>
     23#include <llvm/IR/DerivedTypes.h>
     24#include <llvm/IR/Type.h>
    2525
    2626#include <GTLCore/LLVMBackend/CodeGenerator_p.h>
    2727#include <GTLCore/CompilationMessage.h>

  • OpenCTL/OpenCTL/Module.cpp 

    diff -up OpenCTL/OpenCTL/Module.cpp.jx OpenCTL/OpenCTL/Module.cpp
    old new  
    3838using namespace OpenCTL;
    3939
    4040// LLVM
    41 #include <llvm/Module.h>
     41#include <llvm/IR/Module.h>
    4242#include <llvm/Bitcode/ReaderWriter.h>
    4343#ifdef LLVM_27_OR_28
    4444#include <llvm/System/Path.h>
    … … using namespace OpenCTL; 
    4747#include <llvm/Support/Path.h>
    4848#include <llvm/Support/DynamicLibrary.h>
    4949#endif
    50 #include <llvm/Module.h>
    51 #include <llvm/LLVMContext.h>
     50#include <llvm/IR/LLVMContext.h>
    5251
    5352struct Module::Private {
    5453  Private() : moduleData(0), isStandardLibrary(false) {}

  • OpenCTL/OpenCTL/Program.cpp 

    diff -up OpenCTL/OpenCTL/Program.cpp.jx OpenCTL/OpenCTL/Program.cpp
    old new  
    2020#include "Program.h"
    2121
    2222// LLVM
    23 #include <llvm/DerivedTypes.h>
    24 #include <llvm/Instructions.h>
    25 #include <llvm/Module.h>
     23#include <llvm/IR/DerivedTypes.h>
     24#include <llvm/IR/Instructions.h>
     25#include <llvm/IR/Module.h>
    2626#include <llvm/Transforms/Utils/Cloning.h>
    2727
    2828// Passes
    2929#include <llvm/PassManager.h>
    3030#include <llvm/Analysis/LoopPass.h>
    3131#include <llvm/Analysis/Verifier.h>
    32 #include <llvm/GlobalVariable.h>
     32#include <llvm/IR/GlobalVariable.h>
    3333
    3434// GTLCore
    3535#include "GTLCore/Buffer.h"

  • OpenGTL/GTLCore/AST/AccessorExpression.cpp 

    diff -up OpenGTL/GTLCore/AST/AccessorExpression.cpp.jx OpenGTL/GTLCore/AST/AccessorExpression.cpp
    old new  
    2020#include "AccessorExpression.h"
    2121
    2222#include <llvm/ADT/ArrayRef.h>
    23 #include <llvm/Constants.h>
    24 #include <llvm/Function.h>
    25 #include <llvm/Instructions.h>
     23#include <llvm/IR/Constants.h>
     24#include <llvm/IR/Function.h>
     25#include <llvm/IR/Instructions.h>
    2626
    2727#include "../LLVMBackend/CodeGenerator_p.h"
    2828#include "../LLVMBackend/ExpressionResult_p.h"

  • OpenGTL/GTLCore/AST/BinaryExpression.cpp 

    diff -up OpenGTL/GTLCore/AST/BinaryExpression.cpp.jx OpenGTL/GTLCore/AST/BinaryExpression.cpp
    old new  
    1919
    2020#include "BinaryExpression.h"
    2121
    22 #include <llvm/Instructions.h>
     22#include <llvm/IR/Instructions.h>
    2323
    2424#include <GTLCore/Debug.h>
    2525#include <GTLCore/LLVMBackend/CodeGenerator_p.h>

  • OpenGTL/GTLCore/AST/CompoundExpression.cpp 

    diff -up OpenGTL/GTLCore/AST/CompoundExpression.cpp.jx OpenGTL/GTLCore/AST/CompoundExpression.cpp
    old new  
    1919
    2020#include "CompoundExpression.h"
    2121
    22 #include <llvm/Constants.h>
    23 #include <llvm/DerivedTypes.h>
    24 #include <llvm/GlobalVariable.h>
    25 #include <llvm/Instructions.h>
     22#include <llvm/IR/Constants.h>
     23#include <llvm/IR/DerivedTypes.h>
     24#include <llvm/IR/GlobalVariable.h>
     25#include <llvm/IR/Instructions.h>
    2626
    2727#include "../LLVMBackend/CodeGenerator_p.h"
    2828#include "../Debug.h"

  • OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp 

    diff -up OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp.jx OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp
    old new  
    1919
    2020#include "ConstantCompoundExpression.h"
    2121
    22 #include <llvm/Constants.h>
    23 #include <llvm/DerivedTypes.h>
    24 #include <llvm/GlobalVariable.h>
    25 #include <llvm/Instructions.h>
     22#include <llvm/IR/Constants.h>
     23#include <llvm/IR/DerivedTypes.h>
     24#include <llvm/IR/GlobalVariable.h>
     25#include <llvm/IR/Instructions.h>
    2626
    2727#include "../LLVMBackend/CodeGenerator_p.h"
    2828#include "../Debug.h"

  • OpenGTL/GTLCore/AST/Expression.cpp 

    diff -up OpenGTL/GTLCore/AST/Expression.cpp.jx OpenGTL/GTLCore/AST/Expression.cpp
    old new  
    1919
    2020#include "Expression.h"
    2121
    22 #include <llvm/Constant.h>
    23 #include <llvm/Constants.h>
    24 #include <llvm/Function.h>
    25 #include <llvm/GlobalVariable.h>
    26 #include <llvm/Instructions.h>
     22#include <llvm/IR/Constant.h>
     23#include <llvm/IR/Constants.h>
     24#include <llvm/IR/Function.h>
     25#include <llvm/IR/GlobalVariable.h>
     26#include <llvm/IR/Instructions.h>
    2727
    2828#include "GTLCore/LLVMBackend/CodeGenerator_p.h"
    2929#include "GTLCore/LLVMBackend/ExpressionResult_p.h"

  • OpenGTL/GTLCore/AST/FunctionDeclaration.cpp 

    diff -up OpenGTL/GTLCore/AST/FunctionDeclaration.cpp.jx OpenGTL/GTLCore/AST/FunctionDeclaration.cpp
    old new  
    1919
    2020#include "FunctionDeclaration.h"
    2121
    22 #include <llvm/DerivedTypes.h>
    23 #include <llvm/Function.h>
    24 #include <llvm/Instructions.h>
    25 #include <llvm/Type.h>
     22#include <llvm/IR/DerivedTypes.h>
     23#include <llvm/IR/Function.h>
     24#include <llvm/IR/Instructions.h>
     25#include <llvm/IR/Type.h>
    2626
    2727#include <GTLCore/LLVMBackend/CodeGenerator_p.h>
    2828#include <GTLCore/LLVMBackend/ExpressionResult_p.h>

  • OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp 

    diff -up OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp.jx OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp
    old new  
    2121
    2222#include <stdlib.h>
    2323
    24 #include <llvm/Constant.h>
    25 #include <llvm/Instructions.h>
     24#include <llvm/IR/Constant.h>
     25#include <llvm/IR/Instructions.h>
    2626
    2727#include "../Type.h"
    2828#include "../LLVMBackend/CodeGenerator_p.h"

  • OpenGTL/GTLCore/AST/Statement.cpp 

    diff -up OpenGTL/GTLCore/AST/Statement.cpp.jx OpenGTL/GTLCore/AST/Statement.cpp
    old new  
    2121
    2222// LLVM
    2323#include <llvm/ADT/ArrayRef.h>
    24 #include <llvm/BasicBlock.h>
    25 #include <llvm/Constants.h>
    26 #include <llvm/Function.h>
    27 #include <llvm/GlobalVariable.h>
    28 #include <llvm/Instructions.h>
    29 #include <llvm/Module.h>
     24#include <llvm/IR/BasicBlock.h>
     25#include <llvm/IR/Constants.h>
     26#include <llvm/IR/Function.h>
     27#include <llvm/IR/GlobalVariable.h>
     28#include <llvm/IR/Instructions.h>
     29#include <llvm/IR/Module.h>
    3030
    3131// GTLCore
    3232#include <GTLCore/LLVMBackend/CodeGenerator_p.h>

  • OpenGTL/GTLCore/AST/Tree.cpp 

    diff -up OpenGTL/GTLCore/AST/Tree.cpp.jx OpenGTL/GTLCore/AST/Tree.cpp
    old new  
    1919
    2020#include "Tree.h"
    2121
    22 #include <llvm/Constant.h>
    23 #include <llvm/GlobalVariable.h>
    24 #include <llvm/Type.h>
     22#include <llvm/IR/Constant.h>
     23#include <llvm/IR/GlobalVariable.h>
     24#include <llvm/IR/Type.h>
    2525
    2626#include "FunctionDeclaration.h"
    2727
    … …  
    3737#include "GTLCore/LLVMBackend/Visitor_p.h"
    3838
    3939#include "Expression.h"
    40 #include <llvm/Module.h>
    41 #include <llvm/DerivedTypes.h>
     40#include <llvm/IR/Module.h>
     41#include <llvm/IR/DerivedTypes.h>
    4242
    4343using namespace GTLCore::AST;
    4444

  • OpenGTL/GTLCore/Debug.cpp 

    diff -up OpenGTL/GTLCore/Debug.cpp.jx OpenGTL/GTLCore/Debug.cpp
    old new  
    2222#include <map>
    2323#include <fstream>
    2424
    25 #include <llvm/Module.h>
    26 #include <llvm/Value.h>
    27 #include <llvm/Type.h>
     25#include <llvm/IR/Module.h>
     26#include <llvm/IR/Value.h>
     27#include <llvm/IR/Type.h>
    2828#include <llvm/Support/Path.h>
    2929#include <llvm/Support/raw_ostream.h>
    3030
    … … namespace GTLCore { 
    418418
    419419#ifdef OPENGTL_ENABLE_DEBUG_OUTPUT
    420420
    421 #include <llvm/DerivedTypes.h>
    422 #include <llvm/Function.h>
    423 #include <llvm/Type.h>
     421#include <llvm/IR/DerivedTypes.h>
     422#include <llvm/IR/Function.h>
     423#include <llvm/IR/Type.h>
    424424
    425425void compareFunctionParameters( llvm::Value* func, const std::vector<llvm::Value*>& params  )
    426426{

  • OpenGTL/GTLCore/FunctionCaller_p.cpp 

    diff -up OpenGTL/GTLCore/FunctionCaller_p.cpp.jx OpenGTL/GTLCore/FunctionCaller_p.cpp
    old new  
    2121
    2222#include <llvm/ExecutionEngine/GenericValue.h>
    2323#include <llvm/ExecutionEngine/ExecutionEngine.h>
    24 #include <llvm/Function.h>
    25 
    26 #include <llvm/DerivedTypes.h> // <- I don't understand why I need to include that file to be able to display llvm::Type on the standard output
     24#include <llvm/IR/Function.h>
     25#include <llvm/IR/Instructions.h>
     26#include <llvm/IR/DerivedTypes.h> // <- I don't understand why I need to include that file to be able to display llvm::Type on the standard output
    2727
    2828#include "VirtualMachine_p.h"
    2929
    … …  
    3535#include "LLVMBackend/GenerationContext_p.h"
    3636#include "ModuleData_p.h"
    3737#include "LLVMBackend/CodeGenerator_p.h"
    38 #include <llvm/Instructions.h>
    3938#include "Type_p.h"
    4039#include <GTLCore/Parameter.h>
    4140#include "PrimitiveTypesTraits_p.h"

  • OpenGTL/GTLCore/Function_p.cpp 

    diff -up OpenGTL/GTLCore/Function_p.cpp.jx OpenGTL/GTLCore/Function_p.cpp
    old new  
    2121
    2222#include <cstdarg>
    2323
    24 #include <llvm/DerivedTypes.h>
    25 #include <llvm/Module.h>
    26 #include <llvm/Type.h>
     24#include <llvm/IR/DerivedTypes.h>
     25#include <llvm/IR/Module.h>
     26#include <llvm/IR/Type.h>
    2727
    2828#include "Parameter.h"
    2929

  • OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp 

    diff -up OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp.jx OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp
    old new  
    1919
    2020#include "CodeGenerator_p.h"
    2121
    22 #include <llvm/CallingConv.h>
    23 #include <llvm/Constants.h>
    24 #include <llvm/Function.h>
    25 #include <llvm/Instructions.h>
    26 #include <llvm/Module.h>
    27 #include <llvm/Value.h>
     22#include <llvm/IR/CallingConv.h>
     23#include <llvm/IR/Constants.h>
     24#include <llvm/IR/Function.h>
     25#include <llvm/IR/Instructions.h>
     26#include <llvm/IR/Module.h>
     27#include <llvm/IR/Value.h>
    2828
    2929#include "GTLCore/Debug.h"
    3030#include "ExpressionResult_p.h"

  • OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp 

    diff -up OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp.jx OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp
    old new  
    2020#include "ContextManager_p.h"
    2121
    2222#include <llvm/Support/ThreadLocal.h>
    23 #include <llvm/LLVMContext.h>
     23#include <llvm/IR/LLVMContext.h>
    2424
    2525using namespace LLVMBackend;
    2626

  • OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp 

    diff -up OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp.jx OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp
    old new  
    2020#include "ExpressionGenerationContext_p.h"
    2121
    2222#include "GTLCore/Debug.h"
    23 #include <llvm/BasicBlock.h>
     23#include <llvm/IR/BasicBlock.h>
    2424
    2525#include "GTLCore/Macros_p.h"
    2626

  • OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp 

    diff -up OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp.jx OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp
    old new  
    1919
    2020#include "ExpressionResult_p.h"
    2121
    22 #include "llvm/Constant.h"
    23 #include "llvm/DerivedTypes.h"
     22#include "llvm/IR/Constant.h"
     23#include "llvm/IR/DerivedTypes.h"
    2424
    2525#include "../Type.h"
    2626#include "../Type_p.h"

  • OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp 

    diff -up OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp.jx OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp
    old new  
    2222#include "GTLCore/ModuleData_p.h"
    2323#include "GTLCore/Debug.h"
    2424
    25 #include "llvm/BasicBlock.h"
    26 #include "llvm/Function.h"
     25#include "llvm/IR/BasicBlock.h"
     26#include "llvm/IR/Function.h"
    2727
    2828#include "GTLCore/AST/Statement.h"
    2929

  • OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp 

    diff -up OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp.jx OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp
    old new  
    2020#include "Visitor_p.h"
    2121
    2222// LLVM
    23 #include <llvm/BasicBlock.h>
    24 #include <llvm/Constants.h>
    25 #include <llvm/Function.h>
    26 #include <llvm/Instructions.h>
    27 #include <llvm/Module.h>
    28 #include <llvm/GlobalVariable.h>
     23#include <llvm/IR/BasicBlock.h>
     24#include <llvm/IR/Constants.h>
     25#include <llvm/IR/Function.h>
     26#include <llvm/IR/Instructions.h>
     27#include <llvm/IR/Module.h>
     28#include <llvm/IR/GlobalVariable.h>
    2929
    3030// GTLCore
    3131#include "CodeGenerator_p.h"

  • OpenGTL/GTLCore/ModuleData_p.cpp 

    diff -up OpenGTL/GTLCore/ModuleData_p.cpp.jx OpenGTL/GTLCore/ModuleData_p.cpp
    old new  
    2121
    2222#include <sstream>
    2323
    24 #include <llvm/Module.h>
     24#include <llvm/IR/Module.h>
    2525#include <llvm/PassManager.h>
    2626#include <llvm/Target/TargetMachine.h>
    2727#include <llvm/Analysis/Verifier.h>
    … … void ModuleData::doLink() 
    242242  GTL_ASSERT( not m_llvmLinkedModule );
    243243  m_llvmLinkedModule = m_llvmModule;
    244244  m_llvmModule = llvm::CloneModule( m_llvmModule );
    245   llvm::Linker linker("", m_llvmLinkedModule);
     245  llvm::Linker linker(m_llvmLinkedModule);
    246246  std::string errorMessage;
    247247  foreach( const llvm::Module* mod, m_linkModuleWith )
    248248  {
    … … void ModuleData::doLink() 
    270270        hide.push_back(name);
    271271      }
    272272    }
    273     linker.LinkInModule( clone, &errorMessage );
     273    linker.linkInModule( clone, &errorMessage );
    274274   
    275275    GTL_DEBUG("Linking error: " << errorMessage );
    276276    delete clone;
    277277  }
    278   foreach( const GTLCore::String& mod, m_linkModuleWithArchives )
    279   {
    280     bool v = false;
    281     linker.LinkInArchive( llvm::sys::Path( (const std::string&) mod), v);
    282   }
    283  
    284   linker.releaseModule();
    285278 
    286279  // Hide symbols
    287280  foreach(GTLCore::String name, hide)

  • OpenGTL/GTLCore/Type.cpp 

    diff -up OpenGTL/GTLCore/Type.cpp.jx OpenGTL/GTLCore/Type.cpp
    old new  
    2525
    2626#include <iostream>
    2727
    28 #include <llvm/DerivedTypes.h>
     28#include <llvm/IR/DerivedTypes.h>
    2929
    3030#include "wrappers/StructWrap.h"
    3131#include "SharedPointer.h"

  • OpenGTL/GTLCore/Type_p.cpp 

    diff -up OpenGTL/GTLCore/Type_p.cpp.jx OpenGTL/GTLCore/Type_p.cpp
    old new  
    3030
    3131using namespace GTLCore;
    3232
    33 #include <llvm/Type.h>
    34 #include <llvm/DerivedTypes.h>
     33#include <llvm/IR/Type.h>
     34#include <llvm/IR/DerivedTypes.h>
    3535
    3636Type::StructDataMember::Information::~Information()
    3737{

  • OpenGTL/GTLCore/Value_p.cpp 

    diff -up OpenGTL/GTLCore/Value_p.cpp.jx OpenGTL/GTLCore/Value_p.cpp
    old new  
    1919
    2020#include "Value_p.h"
    2121
    22 #include <llvm/DerivedTypes.h>
    23 #include <llvm/Type.h>
     22#include <llvm/IR/DerivedTypes.h>
     23#include <llvm/IR/Type.h>
    2424
    2525#include "Debug.h"
    2626#include "Value.h"

  • OpenGTL/GTLCore/VariableNG_p.cpp 

    diff -up OpenGTL/GTLCore/VariableNG_p.cpp.jx OpenGTL/GTLCore/VariableNG_p.cpp
    old new  
    1919
    2020#include "VariableNG_p.h"
    2121
    22 #include <llvm/Constants.h>
    23 #include <llvm/Instructions.h>
     22#include <llvm/IR/Constants.h>
     23#include <llvm/IR/Instructions.h>
    2424
    2525#include "LLVMBackend/CodeGenerator_p.h"
    2626#include "Debug.h"

  • OpenGTL/GTLCore/VirtualMachine_p.cpp 

    diff -up OpenGTL/GTLCore/VirtualMachine_p.cpp.jx OpenGTL/GTLCore/VirtualMachine_p.cpp
    old new  
    2121
    2222// JIT
    2323#include <llvm/ExecutionEngine/ExecutionEngine.h>
    24 #include <llvm/Module.h>
    25 #include <llvm/DerivedTypes.h>
     24#include <llvm/IR/Module.h>
     25#include <llvm/IR/DerivedTypes.h>
    2626#include <llvm/Target/TargetOptions.h>
    27 #include <llvm/LLVMContext.h>
     27#include <llvm/IR/LLVMContext.h>
    2828#include <llvm/Support/CommandLine.h>
    2929#include <llvm/Support/Threading.h>
    3030#include <llvm/Support/ErrorHandling.h>
    … … struct VirtualMachine::Private { 
    4848VirtualMachine* VirtualMachine::Private::virtualMachine = 0;
    4949int VirtualMachine::Private::optimLevel = 2;
    5050
    51 void gtl_llvm_error_handler(void *user_data, const std::string& reason)
     51void gtl_llvm_error_handler(void *user_data, const std::string& reason,
     52                            bool gen_crash_diag)
    5253{
    5354  GTL_ABORT(reason);
    5455}
    … … VirtualMachine::VirtualMachine() : d(new 
    5859{
    5960  d->executionEngine = 0;
    6061 
    61 #ifdef LLVM_27
    62   llvm::llvm_install_error_handler(&gtl_llvm_error_handler);
    63 #else
    64   llvm::install_fatal_error_handler(&gtl_llvm_error_handler);
    65 #endif
     62  llvm::install_fatal_error_handler(gtl_llvm_error_handler);
    6663 
    6764  llvm::llvm_start_multithreaded();
    6865

  • OpenGTL/GTLFragment/Compiler_p.cpp 

    diff -up OpenGTL/GTLFragment/Compiler_p.cpp.jx OpenGTL/GTLFragment/Compiler_p.cpp
    old new  
    1919
    2020#include "Compiler_p.h"
    2121
    22 #include <llvm/Module.h>
     22#include <llvm/IR/Module.h>
    2323#include <llvm/PassManager.h>
    2424
    2525#include "GTLCore/AST/Expression.h"

  • OpenGTL/GTLFragment/Library.cpp 

    diff -up OpenGTL/GTLFragment/Library.cpp.jx OpenGTL/GTLFragment/Library.cpp
    old new  
    2222
    2323#include <sstream>
    2424
    25 #include <llvm/Module.h>
     25#include <llvm/IR/Module.h>
    2626#include <llvm/Support/DynamicLibrary.h>
    27 #include <llvm/LLVMContext.h>
     27#include <llvm/IR/LLVMContext.h>
    2828
    2929#include "GTLCore/CompilationMessage.h"
    3030#include "GTLCore/Function.h"

  • OpenGTL/GTLFragment/Wrapper.cpp 

    diff -up OpenGTL/GTLFragment/Wrapper.cpp.jx OpenGTL/GTLFragment/Wrapper.cpp
    old new  
    2929
    3030#include "Library.h"
    3131#include <GTLCore/Function_p.h>
    32 #include <llvm/Module.h>
     32#include <llvm/IR/Module.h>
    3333#include <GTLCore/Type_p.h>
    3434
    3535using namespace GTLFragment;

  • OpenShiva/OpenShiva/CodeGenerator_p.cpp 

    diff -up OpenShiva/OpenShiva/CodeGenerator_p.cpp.jx OpenShiva/OpenShiva/CodeGenerator_p.cpp
    old new  
    2121
    2222#include <vector>
    2323
    24 #include <llvm/CallingConv.h>
    25 #include <llvm/Constants.h>
    26 #include <llvm/Constant.h>
    27 #include <llvm/DerivedTypes.h>
    28 #include <llvm/Function.h>
    29 #include <llvm/Instructions.h>
    30 #include <llvm/Module.h>
    31 #include <llvm/Value.h>
     24#include <llvm/IR/CallingConv.h>
     25#include <llvm/IR/Constants.h>
     26#include <llvm/IR/Constant.h>
     27#include <llvm/IR/DerivedTypes.h>
     28#include <llvm/IR/Function.h>
     29#include <llvm/IR/Instructions.h>
     30#include <llvm/IR/Module.h>
     31#include <llvm/IR/Value.h>
    3232
    3333#include "GTLCore/LLVMBackend/CodeGenerator_p.h"
    3434#include "GTLCore/LLVMBackend/ExpressionResult_p.h"

  • OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp 

    diff -up OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp.jx OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp
    old new  
    2828#include "CodeGenerator_p.h"
    2929#include <GTLFragment/wrappers/ColorWrap_p.h>
    3030#include <GTLCore/Type_p.h>
    31 #include <llvm/Value.h>
    32 #include <llvm/DerivedTypes.h>
    33 #include <llvm/CallingConv.h>
    34 #include <llvm/Module.h>
     31#include <llvm/IR/Value.h>
     32#include <llvm/IR/DerivedTypes.h>
     33#include <llvm/IR/CallingConv.h>
     34#include <llvm/IR/Module.h>
    3535#include <GTLCore/LLVMBackend/ExpressionGenerationContext_p.h>
    3636#include <GTLCore/LLVMBackend/CodeGenerator_p.h>
    37 #include <llvm/Instructions.h>
     37#include <llvm/IR/Instructions.h>
    3838#include <GTLCore/TypesManager.h>
    3939
    4040using namespace OpenShiva;

  • OpenShiva/OpenShiva/Kernel.cpp 

    diff -up OpenShiva/OpenShiva/Kernel.cpp.jx OpenShiva/OpenShiva/Kernel.cpp
    old new  
    2222#include <sstream>
    2323#include <fstream>
    2424
    25 #include <llvm/Module.h>
     25#include <llvm/IR/Module.h>
    2626
    2727#include "GTLCore/CompilationMessage.h"
    2828#include "GTLCore/Function.h"
    … …  
    4848#include "wrappers/ImageWrap_p.h"
    4949#include "wrappers/RegionWrap_p.h"
    5050#include <GTLCore/AST/Tree.h>
    51 #include <llvm/DerivedTypes.h>
     51#include <llvm/IR/DerivedTypes.h>
    5252
    5353using namespace OpenShiva;
    5454

  • OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp 

    diff -up OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp.jx OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp
    old new  
    1919
    2020#include "PixelConvertExpressionFactory_p.h"
    2121
    22 #include <llvm/Instructions.h>
     22#include <llvm/IR/Instructions.h>
     23#include <llvm/IR/Function.h>
    2324
    2425#include "GTLCore/Type.h"
    2526#include "GTLCore/AST/ConvertExpression.h"
    … …  
    3435#include <GTLCore/VariableNG_p.h>
    3536#include <GTLCore/LLVMBackend/Visitor_p.h>
    3637#include <GTLFragment/wrappers/ColorWrap_p.h>
    37 #include <llvm/Function.h>
    3838#include <GTLCore/Type_p.h>
    3939
    4040using namespace OpenShiva;

  • OpenShiva/OpenShiva/PixelVisitor_p.cpp 

    diff -up OpenShiva/OpenShiva/PixelVisitor_p.cpp.jx OpenShiva/OpenShiva/PixelVisitor_p.cpp
    old new  
    2020#include "PixelVisitor_p.h"
    2121
    2222// LLVM
    23 #include <llvm/Constant.h>
    24 #include <llvm/Constants.h>
    25 #include <llvm/BasicBlock.h>
    26 #include <llvm/Instructions.h>
    27 #include <llvm/Function.h>
     23#include <llvm/IR/Constant.h>
     24#include <llvm/IR/Constants.h>
     25#include <llvm/IR/BasicBlock.h>
     26#include <llvm/IR/Instructions.h>
     27#include <llvm/IR/Function.h>
    2828
    2929#include "GTLCore/LLVMBackend/ExpressionResult_p.h"
    3030#include "GTLCore/LLVMBackend/ExpressionGenerationContext_p.h"

  • OpenShiva/OpenShiva/Wrapper_p.cpp 

    diff -up OpenShiva/OpenShiva/Wrapper_p.cpp.jx OpenShiva/OpenShiva/Wrapper_p.cpp
    old new  
    2222#include <map>
    2323#include <vector>
    2424
    25 #include <llvm/DerivedTypes.h>
    26 #include <llvm/Function.h>
    27 #include <llvm/Module.h>
     25#include <llvm/IR/DerivedTypes.h>
     26#include <llvm/IR/Function.h>
     27#include <llvm/IR/Module.h>
    2828
    2929#include "GTLCore/Function_p.h"
    3030#include "GTLCore/Macros.h"