diff gen/tocall.cpp @ 632:df196c8dea26

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!
author Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
date Wed, 01 Oct 2008 23:17:14 +0200
parents 26fce59fe80a
children 30b42a283c8e
line wrap: on
line diff
--- a/gen/tocall.cpp	Wed Oct 01 20:55:13 2008 +0200
+++ b/gen/tocall.cpp	Wed Oct 01 23:17:14 2008 +0200
@@ -104,7 +104,7 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////
 
-void DtoBuildDVarArgList(std::vector<LLValue*>& args, llvm::PAListPtr& palist, TypeFunction* tf, Expressions* arguments, size_t argidx)
+void DtoBuildDVarArgList(std::vector<LLValue*>& args, llvm::AttrListPtr& palist, TypeFunction* tf, Expressions* arguments, size_t argidx)
 {
     Logger::println("doing d-style variadic arguments");
 
@@ -235,7 +235,7 @@
     LLFunctionType::param_iterator argiter = argbegin;
 
     // parameter attributes
-    llvm::PAListPtr palist;
+    llvm::AttrListPtr palist;
 
     // return attrs
     if (tf->retAttrs)
@@ -250,7 +250,7 @@
         LLValue* retvar = DtoAlloca(argiter->get()->getContainedType(0), ".rettmp");
         ++argiter;
         args.push_back(retvar);
-        palist = palist.addAttr(1, llvm::ParamAttr::StructRet);
+        palist = palist.addAttr(1, llvm::Attribute::StructRet);
     }
 
     // then comes a context argument...
@@ -364,26 +364,13 @@
     {
         LLFunction* llfunc = llvm::dyn_cast<LLFunction>(dfnval->val);
         if (llfunc && llfunc->isIntrinsic())
-            palist = llvm::Intrinsic::getParamAttrs((llvm::Intrinsic::ID)llfunc->getIntrinsicID());
+            palist = llvm::Intrinsic::getAttributes((llvm::Intrinsic::ID)llfunc->getIntrinsicID());
         else
             call->setCallingConv(callconv);
     }
     else
         call->setCallingConv(callconv);
-    call->setParamAttrs(palist);
+    call->setAttributes(palist);
 
     return new DImValue(resulttype, retllval);
 }
-
-
-
-
-
-
-
-
-
-
-
-
-