Projects
Essentials
lightspark
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 82
View file
build.patch
Changed
@@ -151,7 +151,7 @@ th->FPM=new llvm::FunctionPassManager(th->module); #ifdef LLVM_35 diff --git a/src/scripting/abc_codesynt.cpp b/src/scripting/abc_codesynt.cpp -index 2eb28fe..3034b67 100644 +index 2eb28fe..d07ccd6 100644 --- a/src/scripting/abc_codesynt.cpp +++ b/src/scripting/abc_codesynt.cpp @@ -26,7 +26,11 @@ @@ -167,48 +167,58 @@ #ifdef HAVE_IR_DATALAYOUT_H # include <llvm/IR/Constants.h> # include <llvm/IR/DerivedTypes.h> -@@ -819,13 +823,13 @@ inline llvm::Value* getMultiname(llvm::ExecutionEngine* ex,llvm::IRBuilder<>& Bu +@@ -819,13 +823,25 @@ inline llvm::Value* getMultiname(llvm::ExecutionEngine* ex,llvm::IRBuilder<>& Bu stack_entry rt1=static_stack_pop(Builder,static_stack,dynamic_stack,dynamic_stack_index); /*if(rt1.second==STACK_INT) //TODO: for them, first parameter is call_context, not ABCContext -- name = Builder.CreateCall3(ex->FindFunctionNamed("getMultiname_i"), context, rt1.first, mindx); -+ name = Builder.CreateCall(ex->FindFunctionNamed("getMultiname_i"). {context, rt1.first, mindx}); ++#ifdef LLVM_37 ++ name = Builder.CreateCall(ex->FindFunctionNamed("getMultiname_i"), {context, rt1.first, mindx}); ++#else + name = Builder.CreateCall3(ex->FindFunctionNamed("getMultiname_i"), context, rt1.first, mindx); ++#endif else if(rt1.second==STACK_NUMBER) -- name = Builder.CreateCall3(ex->FindFunctionNamed("getMultiname_d"), context, rt1.first, mindx); -+ name = Builder.CreateCall(ex->FindFunctionNamed("getMultiname_d"). {context, rt1.first, mindx}); ++#ifdef LLVM_37 ++ name = Builder.CreateCall(ex->FindFunctionNamed("getMultiname_d"), {context, rt1.first, mindx}); ++#else + name = Builder.CreateCall3(ex->FindFunctionNamed("getMultiname_d"), context, rt1.first, mindx); ++#endif else*/ { abstract_value(ex,Builder,rt1); -- name = Builder.CreateCall4(ex->FindFunctionNamed("getMultiname"), context, rt1.first, constnull, mindx); -+ name = Builder.CreateCall(ex->FindFunctionNamed("getMultiname"). {context, rt1.first, constnull, mindx}); ++#ifdef LLVM_37 ++ name = Builder.CreateCall(ex->FindFunctionNamed("getMultiname"), {context, rt1.first, constnull, mindx}); ++#else + name = Builder.CreateCall4(ex->FindFunctionNamed("getMultiname"), context, rt1.first, constnull, mindx); ++#endif } } else if(rtdata==2) -@@ -834,7 +838,7 @@ inline llvm::Value* getMultiname(llvm::ExecutionEngine* ex,llvm::IRBuilder<>& Bu +@@ -834,7 +850,11 @@ inline llvm::Value* getMultiname(llvm::ExecutionEngine* ex,llvm::IRBuilder<>& Bu stack_entry rt2=static_stack_pop(Builder,static_stack,dynamic_stack,dynamic_stack_index); abstract_value(ex,Builder,rt1); abstract_value(ex,Builder,rt2); -- name = Builder.CreateCall4(ex->FindFunctionNamed("getMultiname"), context, rt1.first, rt2.first, mindx); -+ name = Builder.CreateCall(ex->FindFunctionNamed("getMultiname"). {context, rt1.first, rt2.first, mindx}); ++#ifdef LLVM_37 ++ name = Builder.CreateCall(ex->FindFunctionNamed("getMultiname"), {context, rt1.first, rt2.first, mindx}); ++#else + name = Builder.CreateCall4(ex->FindFunctionNamed("getMultiname"), context, rt1.first, rt2.first, mindx); ++#endif } else assert(false); -@@ -1866,9 +1870,12 @@ SyntheticFunction::synt_function method_info::synt_method() - llvm::Function::ArgumentListType::iterator it=llvmf->getArgumentList().begin(); - //The first and only argument to this function is the call_context* +@@ -1868,7 +1888,11 @@ SyntheticFunction::synt_function method_info::synt_method() llvm::Value* context=it; -- + //let's give access to local data storage - value=Builder.CreateStructGEP(context,0); + value=Builder.CreateStructGEP( +#ifdef LLVM_37 + nullptr, +#endif -+ context, 0); ++ context,0); llvm::Value* locals=Builder.CreateLoad(value); //the stack is statically handled as much as possible to allow llvm optimizations -@@ -1876,12 +1883,24 @@ SyntheticFunction::synt_function method_info::synt_method() +@@ -1876,12 +1900,24 @@ SyntheticFunction::synt_function method_info::synt_method() vector<stack_entry> static_stack; static_stack.reserve(body->max_stack); //Get the pointer to the dynamic stack @@ -236,834 +246,1134 @@ /* //Allocate a fast dynamic stack based on LLVM alloca instruction //This is used on branches -@@ -2098,7 +2117,7 @@ SyntheticFunction::synt_function method_info::synt_method() +@@ -2098,7 +2134,11 @@ SyntheticFunction::synt_function method_info::synt_method() u30 t; code >> t; constant = llvm::ConstantInt::get(int_type, t); -- Builder.CreateCall2(ex->FindFunctionNamed("getSuper"), context, constant); -+ Builder.CreateCall(ex->FindFunctionNamed("getSuper"). {context, constant}); ++#ifdef LLVM_37 ++ Builder.CreateCall(ex->FindFunctionNamed("getSuper"), {context, constant}); ++#else + Builder.CreateCall2(ex->FindFunctionNamed("getSuper"), context, constant); ++#endif break; } case 0x05: -@@ -2109,7 +2128,7 @@ SyntheticFunction::synt_function method_info::synt_method() +@@ -2109,7 +2149,11 @@ SyntheticFunction::synt_function method_info::synt_method() u30 t; code >> t; constant = llvm::ConstantInt::get(int_type, t); -- Builder.CreateCall2(ex->FindFunctionNamed("setSuper"), context, constant); -+ Builder.CreateCall(ex->FindFunctionNamed("setSuper"). {context, constant}); ++#ifdef LLVM_37 ++ Builder.CreateCall(ex->FindFunctionNamed("setSuper"), {context, constant}); ++#else + Builder.CreateCall2(ex->FindFunctionNamed("setSuper"), context, constant); ++#endif break; } case 0x06: -@@ -2119,7 +2138,7 @@ SyntheticFunction::synt_function method_info::synt_method() +@@ -2119,7 +2163,11 @@ SyntheticFunction::synt_function method_info::synt_method() u30 t; code >> t; constant = llvm::ConstantInt::get(int_type, t); -- Builder.CreateCall2(ex->FindFunctionNamed("dxns"), context, constant); -+ Builder.CreateCall(ex->FindFunctionNamed("dxns"). {context, constant}); ++#ifdef LLVM_37 ++ Builder.CreateCall(ex->FindFunctionNamed("dxns"), {context, constant}); ++#else + Builder.CreateCall2(ex->FindFunctionNamed("dxns"), context, constant); ++#endif break; } case 0x07: -@@ -2128,7 +2147,7 @@ SyntheticFunction::synt_function method_info::synt_method() +@@ -2128,7 +2176,11 @@ SyntheticFunction::synt_function method_info::synt_method() LOG(LOG_TRACE, _("synt dxnslate") ); stack_entry v=static_stack_pop(Builder,static_stack,dynamic_stack,dynamic_stack_index); abstract_value(ex,Builder,v); -- Builder.CreateCall2(ex->FindFunctionNamed("dxns"), context, v.first); -+ Builder.CreateCall(ex->FindFunctionNamed("dxns"). {context, v.first}); ++#ifdef LLVM_37 ++ Builder.CreateCall(ex->FindFunctionNamed("dxns"), {context, v.first}); ++#else + Builder.CreateCall2(ex->FindFunctionNamed("dxns"), context, v.first); ++#endif break; } case 0x08: -@@ -2179,7 +2198,7 @@ SyntheticFunction::synt_function method_info::synt_method() +@@ -2179,7 +2231,11 @@ SyntheticFunction::synt_function method_info::synt_method() { abstract_value(ex,Builder,v1); abstract_value(ex,Builder,v2); -- cond=Builder.CreateCall2(ex->FindFunctionNamed("ifNLT"), v1.first, v2.first); -+ cond=Builder.CreateCall(ex->FindFunctionNamed("ifNLT"). {v1.first, v2.first}); ++#ifdef LLVM_37 ++ cond=Builder.CreateCall(ex->FindFunctionNamed("ifNLT"), {v1.first, v2.first}); ++#else + cond=Builder.CreateCall2(ex->FindFunctionNamed("ifNLT"), v1.first, v2.first); ++#endif } syncStacks(ex,Builder,static_stack,dynamic_stack,dynamic_stack_index); -@@ -2212,7 +2231,7 @@ SyntheticFunction::synt_function method_info::synt_method() +@@ -2212,7 +2268,11 @@ SyntheticFunction::synt_function method_info::synt_method() abstract_value(ex,Builder,v1); abstract_value(ex,Builder,v2); -- llvm::Value* cond=Builder.CreateCall2(ex->FindFunctionNamed("ifNLE"), v1.first, v2.first); -+ llvm::Value* cond=Builder.CreateCall(ex->FindFunctionNamed("ifNLE"). {v1.first, v2.first}); ++#ifdef LLVM_37 ++ llvm::Value* cond=Builder.CreateCall(ex->FindFunctionNamed("ifNLE"), {v1.first, v2.first}); ++#else + llvm::Value* cond=Builder.CreateCall2(ex->FindFunctionNamed("ifNLE"), v1.first, v2.first); ++#endif syncStacks(ex,Builder,static_stack,dynamic_stack,dynamic_stack_index); -@@ -2245,7 +2264,7 @@ SyntheticFunction::synt_function method_info::synt_method() +@@ -2245,7 +2305,11 @@ SyntheticFunction::synt_function method_info::synt_method() abstract_value(ex,Builder,v1); abstract_value(ex,Builder,v2); -- llvm::Value* cond=Builder.CreateCall2(ex->FindFunctionNamed("ifNGT"), v1.first, v2.first); -+ llvm::Value* cond=Builder.CreateCall(ex->FindFunctionNamed("ifNGT"). {v1.first, v2.first}); ++#ifdef LLVM_37 ++ llvm::Value* cond=Builder.CreateCall(ex->FindFunctionNamed("ifNGT"), {v1.first, v2.first}); ++#else + llvm::Value* cond=Builder.CreateCall2(ex->FindFunctionNamed("ifNGT"), v1.first, v2.first); ++#endif syncStacks(ex,Builder,static_stack,dynamic_stack,dynamic_stack_index); -@@ -2278,7 +2297,7 @@ SyntheticFunction::synt_function method_info::synt_method() +@@ -2278,7 +2342,11 @@ SyntheticFunction::synt_function method_info::synt_method() abstract_value(ex,Builder,v1); abstract_value(ex,Builder,v2); -- llvm::Value* cond=Builder.CreateCall2(ex->FindFunctionNamed("ifNGE"), v1.first, v2.first); -+ llvm::Value* cond=Builder.CreateCall(ex->FindFunctionNamed("ifNGE"). {v1.first, v2.first});
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.