Wiki Roadmap Timeline Tickets New Ticket Source Search Help / Guide About Trac Login

Changeset 632:df196c8dea26

Show
Ignore:
Timestamp:
10/01/08 17:17:14 (2 months ago)
Author:
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
branch:
default
Message:

Updated to latest LLVM trunk, function notes have been removed and merged with parameter attributes, which have been renamed to just attributes. Nothing seems to have broke!

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gen/arrays.cpp

    r622 r632  
    759759 
    760760    // set param attrs 
    761     llvm::PAListPtr palist; 
    762     palist = palist.addAttr(1, llvm::ParamAttr::ByVal); 
    763     palist = palist.addAttr(2, llvm::ParamAttr::ByVal); 
    764     call->setParamAttrs(palist); 
     761    llvm::AttrListPtr palist; 
     762    palist = palist.addAttr(1, llvm::Attribute::ByVal); 
     763    palist = palist.addAttr(2, llvm::Attribute::ByVal); 
     764    call->setAttributes(palist); 
    765765 
    766766    return call->get(); 
    …… 
    10731073 
    10741074    std::vector<LLValue*> args; 
    1075     llvm::PAListPtr palist; 
     1075    llvm::AttrListPtr palist; 
    10761076 
    10771077    // file param 
    …… 
    10911091 
    10921092    args.push_back(alloc); 
    1093     palist = palist.addAttr(1, llvm::ParamAttr::ByVal); 
     1093    palist = palist.addAttr(1, llvm::Attribute::ByVal); 
    10941094 
    10951095    // line param 
    …… 
    11001100    llvm::Function* errorfn = LLVM_D_GetRuntimeFunction(gIR->module, "_d_array_bounds"); 
    11011101    CallOrInvoke* call = gIR->CreateCallOrInvoke(errorfn, args.begin(), args.end()); 
    1102     call->setParamAttrs(palist); 
     1102    call->setAttributes(palist); 
    11031103 
    11041104    // the function does not return 

  • gen/dwarftypes.cpp

    r205 r632  
    1010#include <llvm/Instructions.h> 
    1111#include <llvm/InlineAsm.h> 
    12 #include <llvm/ParameterAttributes.h> 
     12#include <llvm/Attributes.h> 
    1313#include <llvm/Support/MathExtras.h> 
    1414#include <llvm/Pass.h> 

  • gen/functions.cpp

    r622 r632  
    133133            paramvec.push_back(getPtrToType(at)); 
    134134            if (!refOrOut) 
    135                 arg->llvmAttrs |= llvm::ParamAttr::ByVal; 
     135                arg->llvmAttrs |= llvm::Attribute::ByVal; 
    136136        } 
    137137        else if (isaArray(at)) { 
    …… 
    342342 
    343343    int funcNumArgs = func->getArgumentList().size(); 
    344     std::vector<llvm::ParamAttrsWithIndex> attrs; 
     344    std::vector<llvm::AttributeWithIndex> attrs; 
    345345    int k = 0; 
    346346 
    347     llvm::ParamAttrsWithIndex PAWI; 
     347    llvm::AttributeWithIndex PAWI; 
    348348 
    349349    // set return value attrs if any 
    …… 
    359359    { 
    360360        PAWI.Index = 1; 
    361         PAWI.Attrs = llvm::ParamAttr::StructRet; 
     361        PAWI.Attrs = llvm::Attribute::StructRet; 
    362362        attrs.push_back(PAWI); 
    363363    } 
    …… 
    367367    { 
    368368        PAWI.Index = llidx; 
    369         PAWI.Attrs = llvm::ParamAttr::ByVal; 
     369        PAWI.Attrs = llvm::Attribute::ByVal; 
    370370        attrs.push_back(PAWI); 
    371371        llidx++; 
    …… 
    385385    } 
    386386 
    387     llvm::PAListPtr palist = llvm::PAListPtr::get(attrs.begin(), attrs.end()); 
    388     func->setParamAttrs(palist); 
     387    llvm::AttrListPtr palist = llvm::AttrListPtr::get(attrs.begin(), attrs.end()); 
     388    func->setAttributes(palist); 
    389389} 
    390390 

  • gen/irstate.h

    r493 r632  
    8989struct CallOrInvoke 
    9090{ 
    91     virtual void setParamAttrs(const llvm::PAListPtr& Attrs) = 0; 
     91    virtual void setAttributes(const llvm::AttrListPtr& Attrs) = 0; 
    9292    virtual void setCallingConv(unsigned CC) = 0; 
    9393    virtual llvm::Instruction* get() = 0; 
    …… 
    9999    CallOrInvoke_Call(llvm::CallInst* call) : inst(call) {} 
    100100 
    101     virtual void setParamAttrs(const llvm::PAListPtr& Attrs) 
    102     { inst->setParamAttrs(Attrs); } 
     101    virtual void setAttributes(const llvm::AttrListPtr& Attrs) 
     102    { inst->setAttributes(Attrs); } 
    103103    virtual void setCallingConv(unsigned CC) 
    104104    { inst->setCallingConv(CC); } 
    …… 
    112112    CallOrInvoke_Invoke(llvm::InvokeInst* invoke) : inst(invoke) {} 
    113113 
    114     virtual void setParamAttrs(const llvm::PAListPtr& Attrs) 
    115     { inst->setParamAttrs(Attrs); } 
     114    virtual void setAttributes(const llvm::AttrListPtr& Attrs) 
     115    { inst->setAttributes(Attrs); } 
    116116    virtual void setCallingConv(unsigned CC) 
    117117    { inst->setCallingConv(CC); } 

  • gen/llvm.h

    r629 r632  
    1111#include "llvm/Module.h" 
    1212#include "llvm/Value.h" 
    13 #include "llvm/ParameterAttributes.h" 
     13#include "llvm/Attributes.h" 
    1414 
    1515#include "llvm/Target/TargetData.h" 

  • gen/llvmhelpers.cpp

    r622 r632  
    118118 
    119119    // param attrs 
    120     llvm::PAListPtr palist; 
     120    llvm::AttrListPtr palist; 
    121121    int idx = 1; 
    122122 
    …… 
    142142            args.push_back(msg->getRVal()); 
    143143        } 
    144         palist = palist.addAttr(idx++, llvm::ParamAttr::ByVal); 
     144        palist = palist.addAttr(idx++, llvm::Attribute::ByVal); 
    145145    } 
    146146 
    …… 
    158158 
    159159    args.push_back(alloc); 
    160     palist = palist.addAttr(idx++, llvm::ParamAttr::ByVal); 
     160    palist = palist.addAttr(idx++, llvm::Attribute::ByVal); 
    161161 
    162162 
    …… 
    167167    // call 
    168168    CallOrInvoke* call = gIR->CreateCallOrInvoke(fn, args.begin(), args.end()); 
    169     call->setParamAttrs(palist); 
     169    call->setAttributes(palist); 
    170170 
    171171    // after assert is always unreachable 

  • gen/llvmhelpers.h

    r527 r632  
    134134 
    135135/// 
    136 void DtoBuildDVarArgList(std::vector<LLValue*>& args, llvm::PAListPtr& palist, TypeFunction* tf, Expressions* arguments, size_t argidx); 
     136void DtoBuildDVarArgList(std::vector<LLValue*>& args, llvm::AttrListPtr& palist, TypeFunction* tf, Expressions* arguments, size_t argidx); 
    137137 
    138138/// 

  • gen/runtime.cpp

    r591 r632  
    7070    const llvm::FunctionType* fnty = fn->getFunctionType(); 
    7171    llvm::Function* resfn = llvm::cast<llvm::Function>(target->getOrInsertFunction(name, fnty)); 
    72     resfn->setParamAttrs(fn->getParamAttrs()); 
     72    resfn->setAttributes(fn->getAttributes()); 
    7373    return resfn; 
    7474} 
    …… 
    202202        types.push_back(intTy); 
    203203        const llvm::FunctionType* fty = llvm::FunctionType::get(voidTy, types, false); 
    204         llvm::PAListPtr palist; 
    205         palist = palist.addAttr(1, llvm::ParamAttr::ByVal); 
    206         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setParamAttrs(palist); 
    207         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname2, M)->setParamAttrs(palist); 
    208         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname3, M)->setParamAttrs(palist); 
     204        llvm::AttrListPtr palist; 
     205        palist = palist.addAttr(1, llvm::Attribute::ByVal); 
     206        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setAttributes(palist); 
     207        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname2, M)->setAttributes(palist); 
     208        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname3, M)->setAttributes(palist); 
    209209    } 
    210210 
    …… 
    217217        types.push_back(intTy); 
    218218        const llvm::FunctionType* fty = llvm::FunctionType::get(voidPtrTy, types, false); 
    219         llvm::PAListPtr palist; 
    220         palist = palist.addAttr(1, llvm::ParamAttr::ByVal); 
    221         palist = palist.addAttr(2, llvm::ParamAttr::ByVal); 
    222         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setParamAttrs(palist); 
     219        llvm::AttrListPtr palist; 
     220        palist = palist.addAttr(1, llvm::Attribute::ByVal); 
     221        palist = palist.addAttr(2, llvm::Attribute::ByVal); 
     222        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setAttributes(palist); 
    223223    } 
    224224 
    …… 
    384384        types.push_back(rt_dg1()); \ 
    385385        const llvm::FunctionType* fty = llvm::FunctionType::get(intTy, types, false); \ 
    386         llvm::PAListPtr palist; \ 
    387         palist = palist.addAttr(1, llvm::ParamAttr::ByVal); \ 
    388         palist = palist.addAttr(2, llvm::ParamAttr::ByVal); \ 
    389         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setParamAttrs(palist); \ 
    390         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname2, M)->setParamAttrs(palist); \ 
     386        llvm::AttrListPtr palist; \ 
     387        palist = palist.addAttr(1, llvm::Attribute::ByVal); \ 
     388        palist = palist.addAttr(2, llvm::Attribute::ByVal); \ 
     389        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setAttributes(palist); \ 
     390        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname2, M)->setAttributes(palist); \ 
    391391    } 
    392392    STR_APPLY1(stringTy, "_aApplycw1", "_aApplycd1") 
    …… 
    404404        types.push_back(rt_dg2()); \ 
    405405        const llvm::FunctionType* fty = llvm::FunctionType::get(intTy, types, false); \ 
    406         llvm::PAListPtr palist; \ 
    407         palist = palist.addAttr(1, llvm::ParamAttr::ByVal); \ 
    408         palist = palist.addAttr(2, llvm::ParamAttr::ByVal); \ 
    409         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setParamAttrs(palist); \ 
    410         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname2, M)->setParamAttrs(palist); \ 
     406        llvm::AttrListPtr palist; \ 
     407        palist = palist.addAttr(1, llvm::Attribute::ByVal); \ 
     408        palist = palist.addAttr(2, llvm::Attribute::ByVal); \ 
     409        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setAttributes(palist); \ 
     410        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname2, M)->setAttributes(palist); \ 
    411411    } 
    412412    STR_APPLY2(stringTy, "_aApplycw2", "_aApplycd2") 
    …… 
    423423        types.push_back(rt_dg1()); \ 
    424424        const llvm::FunctionType* fty = llvm::FunctionType::get(intTy, types, false); \ 
    425         llvm::PAListPtr palist; \ 
    426         palist = palist.addAttr(1, llvm::ParamAttr::ByVal); \ 
    427         palist = palist.addAttr(2, llvm::ParamAttr::ByVal); \ 
    428         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setParamAttrs(palist); \ 
    429         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname2, M)->setParamAttrs(palist); \ 
     425        llvm::AttrListPtr palist; \ 
     426        palist = palist.addAttr(1, llvm::Attribute::ByVal); \ 
     427        palist = palist.addAttr(2, llvm::Attribute::ByVal); \ 
     428        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setAttributes(palist); \ 
     429        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname2, M)->setAttributes(palist); \ 
    430430    } 
    431431    STR_APPLY_R1(stringTy, "_aApplyRcw1", "_aApplyRcd1") 
    …… 
    442442        types.push_back(rt_dg2()); \ 
    443443        const llvm::FunctionType* fty = llvm::FunctionType::get(intTy, types, false); \ 
    444         llvm::PAListPtr palist; \ 
    445         palist = palist.addAttr(1, llvm::ParamAttr::ByVal); \ 
    446         palist = palist.addAttr(2, llvm::ParamAttr::ByVal); \ 
    447         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setParamAttrs(palist); \ 
    448         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname2, M)->setParamAttrs(palist); \ 
     444        llvm::AttrListPtr palist; \ 
     445        palist = palist.addAttr(1, llvm::Attribute::ByVal); \ 
     446        palist = palist.addAttr(2, llvm::Attribute::ByVal); \ 
     447        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setAttributes(palist); \ 
     448        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname2, M)->setAttributes(palist); \ 
    449449    } 
    450450    STR_APPLY_R2(stringTy, "_aApplyRcw2", "_aApplyRcd2") 
    …… 
    534534        types.push_back(stringTy); 
    535535        const llvm::FunctionType* fty = llvm::FunctionType::get(voidTy, types, false); 
    536         llvm::PAListPtr palist; 
    537         palist = palist.addAttr(2, llvm::ParamAttr::ByVal); 
    538         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setParamAttrs(palist); 
    539         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname2, M)->setParamAttrs(palist); 
     536        llvm::AttrListPtr palist; 
     537        palist = palist.addAttr(2, llvm::Attribute::ByVal); 
     538        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setAttributes(palist); 
     539        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname2, M)->setAttributes(palist); 
    540540    } 
    541541 
    …… 
    549549        types.push_back(wstringTy); 
    550550        const llvm::FunctionType* fty = llvm::FunctionType::get(voidTy, types, false); 
    551         llvm::PAListPtr palist; 
    552         palist = palist.addAttr(2, llvm::ParamAttr::ByVal); 
    553         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setParamAttrs(palist); 
    554         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname2, M)->setParamAttrs(palist); 
     551        llvm::AttrListPtr palist; 
     552        palist = palist.addAttr(2, llvm::Attribute::ByVal); 
     553        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setAttributes(palist); 
     554        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname2, M)->setAttributes(palist); 
    555555    } 
    556556 
    …… 
    563563        types.push_back(sizeTy); 
    564564        const llvm::FunctionType* fty = llvm::FunctionType::get(voidTy, types, false); 
    565         llvm::PAListPtr palist; 
    566         palist = palist.addAttr(2, llvm::ParamAttr::ByVal); 
    567         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setParamAttrs(palist); 
     565        llvm::AttrListPtr palist; 
     566        palist = palist.addAttr(2, llvm::Attribute::ByVal); 
     567        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setAttributes(palist); 
    568568    } 
    569569 
    …… 
    576576        types.push_back(rt_array(byteTy)); 
    577577        const llvm::FunctionType* fty = llvm::FunctionType::get(voidTy, types, false); 
    578         llvm::PAListPtr palist; 
    579         palist = palist.addAttr(3, llvm::ParamAttr::ByVal); 
    580         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setParamAttrs(palist); 
     578        llvm::AttrListPtr palist; 
     579        palist = palist.addAttr(3, llvm::Attribute::ByVal); 
     580        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setAttributes(palist); 
    581581    } 
    582582 
    …… 
    591591        types.push_back(typeInfoTy); 
    592592        const llvm::FunctionType* fty = llvm::FunctionType::get(intTy, types, false); 
    593         llvm::PAListPtr palist; 
    594         palist = palist.addAttr(1, llvm::ParamAttr::ByVal); 
    595         palist = palist.addAttr(2, llvm::ParamAttr::ByVal); 
    596         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setParamAttrs(palist); 
    597         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname2, M)->setParamAttrs(palist); 
     593        llvm::AttrListPtr palist; 
     594        palist = palist.addAttr(1, llvm::Attribute::ByVal); 
     595        palist = palist.addAttr(2, llvm::Attribute::ByVal); 
     596        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setAttributes(palist); 
     597        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname2, M)->setAttributes(palist); 
    598598    } 
    599599 
    …… 
    605605        types.push_back(rt_array(byteTy)); 
    606606        const llvm::FunctionType* fty = llvm::FunctionType::get(intTy, types, false); 
    607         llvm::PAListPtr palist; 
    608         palist = palist.addAttr(1, llvm::ParamAttr::ByVal); 
    609         palist = palist.addAttr(2, llvm::ParamAttr::ByVal); 
    610         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setParamAttrs(palist); 
     607        llvm::AttrListPtr palist; 
     608        palist = palist.addAttr(1, llvm::Attribute::ByVal); 
     609        palist = palist.addAttr(2, llvm::Attribute::ByVal); 
     610        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setAttributes(palist); 
    611611    } 
    612612 
    …… 
    619619        types.push_back(typeInfoTy); 
    620620        const llvm::FunctionType* fty = llvm::FunctionType::get(voidTy, types, false); 
    621         llvm::PAListPtr palist; 
    622         palist = palist.addAttr(2, llvm::ParamAttr::ByVal); 
    623         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setParamAttrs(palist); 
     621        llvm::AttrListPtr palist; 
     622        palist = palist.addAttr(2, llvm::Attribute::ByVal); 
     623        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setAttributes(palist); 
    624624    } 
    625625 
    …… 
    724724        types.push_back(rt_dg1()); 
    725725        const llvm::FunctionType* fty = llvm::FunctionType::get(intTy, types, false); 
    726         llvm::PAListPtr palist; 
    727         palist = palist.addAttr(3, llvm::ParamAttr::ByVal); 
    728         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setParamAttrs(palist); 
     726        llvm::AttrListPtr palist; 
     727        palist = palist.addAttr(3, llvm::Attribute::ByVal); 
     728        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setAttributes(palist); 
    729729    } 
    730730 
    …… 
    737737        types.push_back(rt_dg1()); 
    738738        const llvm::FunctionType* fty = llvm::FunctionType::get(intTy, types, false); 
    739         llvm::PAListPtr palist; 
    740         palist = palist.addAttr(3, llvm::ParamAttr::ByVal); 
    741         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setParamAttrs(palist); 
     739        llvm::AttrListPtr palist; 
     740        palist = palist.addAttr(3, llvm::Attribute::ByVal); 
     741        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setAttributes(palist); 
    742742    } 
    743743 
    …… 
    814814        types.push_back(stringTy); 
    815815        const llvm::FunctionType* fty = llvm::FunctionType::get(intTy, types, false); 
    816         llvm::PAListPtr palist; 
    817         palist = palist.addAttr(1, llvm::ParamAttr::ByVal); 
    818         palist = palist.addAttr(2, llvm::ParamAttr::ByVal); 
    819         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setParamAttrs(palist); 
     816        llvm::AttrListPtr palist; 
     817        palist = palist.addAttr(1, llvm::Attribute::ByVal); 
     818        palist = palist.addAttr(2, llvm::Attribute::ByVal); 
     819        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setAttributes(palist); 
    820820    } 
    821821 
    …… 
    827827        types.push_back(wstringTy); 
    828828        const llvm::FunctionType* fty = llvm::FunctionType::get(intTy, types, false); 
    829         llvm::PAListPtr palist; 
    830         palist = palist.addAttr(1, llvm::ParamAttr::ByVal); 
    831         palist = palist.addAttr(2, llvm::ParamAttr::ByVal); 
    832         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setParamAttrs(palist); 
     829        llvm::AttrListPtr palist; 
     830        palist = palist.addAttr(1, llvm::Attribute::ByVal); 
     831        palist = palist.addAttr(2, llvm::Attribute::ByVal); 
     832        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setAttributes(palist); 
    833833    } 
    834834 
    …… 
    840840        types.push_back(dstringTy); 
    841841        const llvm::FunctionType* fty = llvm::FunctionType::get(intTy, types, false); 
    842         llvm::PAListPtr palist; 
    843         palist = palist.addAttr(1, llvm::ParamAttr::ByVal); 
    844         palist = palist.addAttr(2, llvm::ParamAttr::ByVal); 
    845         llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setParamAttrs(palist); 
     842        llvm::AttrListPtr palist; 
     843        palist = palist.addAttr(1, llvm::Attribute::ByVal); 
     844        palist = palist.addAttr(2, llvm::Attribute::ByVal); 
     845        llvm::Function::Create(fty, llvm::GlobalValue::ExternalLinkage, fname, M)->setAttributes(palist); 
    846846    } 
    847847 

  • gen/statements.cpp

    r622 r632  
    706706    CallOrInvoke* call = gIR->CreateCallOrInvoke2(fn, table, llval, "tmp"); 
    707707 
    708     llvm::PAListPtr palist; 
    709     palist = palist.addAttr(1, llvm::ParamAttr::ByVal); 
    710     palist = palist.addAttr(2, llvm::ParamAttr::ByVal); 
    711     call->setParamAttrs(palist); 
     708    llvm::AttrListPtr palist; 
     709    palist = palist.addAttr(1, llvm::Attribute::ByVal); 
     710    palist = palist.addAttr(2, llvm::Attribute::ByVal); 
     711    call->setAttributes(palist); 
    712712 
    713713    return call->get(); 
    …… 
    12561256 
    12571257    // param attrs 
    1258     llvm::PAListPtr palist; 
     1258    llvm::AttrListPtr palist; 
    12591259    int idx = 1; 
    12601260 
    …… 
    12771277 
    12781278    args.push_back(alloc); 
    1279     palist = palist.addAttr(idx++, llvm::ParamAttr::ByVal); 
     1279    palist = palist.addAttr(idx++, llvm::Attribute::ByVal); 
    12801280 
    12811281    // line param 
    …… 
    12851285    // call 
    12861286    CallOrInvoke* call = gIR->CreateCallOrInvoke(fn, args.begin(), args.end()); 
    1287     call->setParamAttrs(palist); 
     1287    call->setAttributes(palist); 
    12881288 
    12891289    gIR->ir->CreateUnreachable(); 

  • gen/tocall.cpp

    r622 r632  
    105105////////////////////////////////////////////////////////////////////////////////////////// 
    106106 
    107 void DtoBuildDVarArgList(std::vector<LLValue*>& args, llvm::PAListPtr& palist, TypeFunction* tf, Expressions* arguments, size_t argidx) 
     107void DtoBuildDVarArgList(std::vector<LLValue*>& args, llvm::AttrListPtr& palist, TypeFunction* tf, Expressions* arguments, size_t argidx) 
    108108{ 
    109109    Logger::println("doing d-style variadic arguments"); 
    …… 
    236236 
    237237    // parameter attributes 
    238     llvm::PAListPtr palist; 
     238    llvm::AttrListPtr palist; 
    239239 
    240240    // return attrs 
    …… 
    251251        ++argiter; 
    252252        args.push_back(retvar); 
    253         palist = palist.addAttr(1, llvm::ParamAttr::StructRet); 
     253        palist = palist.addAttr(1, llvm::Attribute::StructRet); 
    254254    } 
    255255 
    …… 
    365365        LLFunction* llfunc = llvm::dyn_cast<LLFunction>(dfnval->val); 
    366366        if (llfunc && llfunc->isIntrinsic()) 
    367             palist = llvm::Intrinsic::getParamAttrs((llvm::Intrinsic::ID)llfunc->getIntrinsicID()); 
     367            palist = llvm::Intrinsic::getAttributes((llvm::Intrinsic::ID)llfunc->getIntrinsicID()); 
    368368        else 
    369369            call->setCallingConv(callconv); 
    …… 
    371371    else 
    372372        call->setCallingConv(callconv); 
    373     call->setParamAttrs(palist); 
     373    call->setAttributes(palist); 
    374374 
    375375    return new DImValue(resulttype, retllval); 
    376376} 
    377  
    378  
    379  
    380  
    381  
    382  
    383  
    384  
    385  
    386  
    387  
    388  
    389  

  • gen/tollvm.cpp

    r622 r632  
    4545        case Tint8: 
    4646        case Tint16: 
    47             return llvm::ParamAttr::SExt; 
     47            return llvm::Attribute::SExt; 
    4848 
    4949        case Tuns8: 
    5050        case Tuns16: 
    51             return llvm::ParamAttr::ZExt; 
     51            return llvm::Attribute::ZExt; 
    5252        } 
    5353    } 
    54     return llvm::ParamAttr::None; 
     54    return llvm::Attribute::None; 
    5555} 
    5656 

  • ir/irfunction.cpp

    r584 r632  
    6767void IrFunction::setNeverInline() 
    6868{ 
    69     llvm::FunctionNotes cur = func->getNotes(); 
    70     assert(!(cur & llvm::FN_NOTE_AlwaysInline) && "function can't be never- and always-inline at the same time"); 
    71     func->setNotes(cur | llvm::FN_NOTE_NoInline); 
     69    assert(!func->hasFnAttr(llvm::Attribute::AlwaysInline) && "function can't be never- and always-inline at the same time"); 
     70    func->addFnAttr(llvm::Attribute::NoInline); 
    7271} 
    7372 
    7473void IrFunction::setAlwaysInline() 
    7574{ 
    76     llvm::FunctionNotes cur = func->getNotes(); 
    77     assert(!(cur & llvm::FN_NOTE_NoInline) && "function can't be never- and always-inline at the same time"); 
    78     func->setNotes(cur | llvm::FN_NOTE_AlwaysInline); 
     75    assert(!func->hasFnAttr(llvm::Attribute::NoInline) && "function can't be never- and always-inline at the same time"); 
     76    func->addFnAttr(llvm::Attribute::AlwaysInline); 
    7977} 
Copyright © 2008, LDC Development Team.