5 files changed, 28 insertions, 21 deletions
diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp
index 8f6bde412ba..168eaf37bde 100644
--- a/clang/lib/CodeGen/CGCall.cpp
+++ b/clang/lib/CodeGen/CGCall.cpp
@@ -14,6 +14,7 @@
 
 #include "CGCall.h"
 #include "CodeGenFunction.h"
+#include "CodeGenModule.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclObjC.h"
@@ -75,11 +76,11 @@ ArgTypeIterator CGCallInfo::argtypes_end() const {
 
 /***/
 
-bool CodeGenFunction::ReturnTypeUsesSret(QualType RetTy) {
-  return hasAggregateLLVMType(RetTy);
+bool CodeGenModule::ReturnTypeUsesSret(QualType RetTy) {
+  return CodeGenFunction::hasAggregateLLVMType(RetTy);
 }
 
-void CodeGenFunction::ConstructParamAttrList(const Decl *TargetDecl,
+void CodeGenModule::ConstructParamAttrList(const Decl *TargetDecl,
                                              ArgTypeIterator begin,
                                              ArgTypeIterator end,
                                              ParamAttrListType &PAL) {
@@ -94,7 +95,7 @@ void CodeGenFunction::ConstructParamAttrList(const Decl *TargetDecl,
 
   QualType ResTy = *begin;
   unsigned Index = 1;
-  if (CodeGenFunction::hasAggregateLLVMType(ResTy)) {
+  if (ReturnTypeUsesSret(ResTy)) {
     PAL.push_back(llvm::ParamAttrsWithIndex::get(Index, 
                                                  llvm::ParamAttr::StructRet));
     ++Index;
@@ -203,8 +204,9 @@ RValue CodeGenFunction::EmitCall(llvm::Value *Callee,
 
   // FIXME: Provide TargetDecl so nounwind, noreturn, etc, etc get set.
   CodeGen::ParamAttrListType ParamAttrList;
-  ConstructParamAttrList(0, CallInfo.argtypes_begin(), CallInfo.argtypes_end(),
-                         ParamAttrList);
+  CGM.ConstructParamAttrList(0, 
+                             CallInfo.argtypes_begin(), CallInfo.argtypes_end(),
+                             ParamAttrList);
   CI->setParamAttrs(llvm::PAListPtr::get(ParamAttrList.begin(), 
                                          ParamAttrList.size()));  
 
diff --git a/clang/lib/CodeGen/CGObjCMac.cpp b/clang/lib/CodeGen/CGObjCMac.cpp
index ff7717dad33..e3fcbdf11d6 100644
--- a/clang/lib/CodeGen/CGObjCMac.cpp
+++ b/clang/lib/CodeGen/CGObjCMac.cpp
@@ -531,7 +531,7 @@ CodeGen::RValue CGObjCMac::EmitMessageSend(CodeGen::CodeGenFunction &CGF,
 
   llvm::Value *Fn = 
     ObjCTypes.getMessageSendFn(IsSuper, 
-                               CGF.ReturnTypeUsesSret(ResultType),
+                               CGM.ReturnTypeUsesSret(ResultType),
                                CGM.getTypes().ConvertType(ResultType));
   return CGF.EmitCall(Fn, ResultType, ActualArgs);
 }
diff --git a/clang/lib/CodeGen/CodeGenFunction.h b/clang/lib/CodeGen/CodeGenFunction.h
index ef7009c5aa5..5054b56d212 100644
--- a/clang/lib/CodeGen/CodeGenFunction.h
+++ b/clang/lib/CodeGen/CodeGenFunction.h
@@ -138,15 +138,6 @@ public:
                      const FunctionArgList &Args);
   void FinishFunction(SourceLocation EndLoc=SourceLocation());
 
-  /// ReturnTypeUsesSret - Return true iff the given type uses 'sret'
-  /// when used as a return type.
-  static bool ReturnTypeUsesSret(QualType RetTy);
-
-  static void ConstructParamAttrList(const Decl *TargetDecl,
-                                     const ArgTypeIterator begin,
-                                     const ArgTypeIterator end,
-                                     ParamAttrListType &PAL);
-
   /// EmitFunctionProlog - Emit the target specific LLVM code to load
   /// the arguments for the given function. This is also responsible
   /// for naming the LLVM function arguments.
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
index 9f7b9772761..e5acc505f5b 100644
--- a/clang/lib/CodeGen/CodeGenModule.cpp
+++ b/clang/lib/CodeGen/CodeGenModule.cpp
@@ -212,12 +212,12 @@ static void SetGlobalValueAttributes(const Decl *D,
   }
 }
 
-static void SetFunctionParamAttrs(const CGFunctionInfo &Info, llvm::Function *F) {
+void CodeGenModule::SetFunctionParamAttrs(const CGFunctionInfo &Info, 
+                                          llvm::Function *F) {
   ParamAttrListType ParamAttrList;
-  CodeGenFunction::ConstructParamAttrList(Info.getDecl(),
-                                          Info.argtypes_begin(), 
-                                          Info.argtypes_end(),
-                                          ParamAttrList);
+  ConstructParamAttrList(Info.getDecl(),
+                         Info.argtypes_begin(), Info.argtypes_end(),
+                         ParamAttrList);
 
   F->setParamAttrs(llvm::PAListPtr::get(ParamAttrList.begin(),
                                         ParamAttrList.size()));
diff --git a/clang/lib/CodeGen/CodeGenModule.h b/clang/lib/CodeGen/CodeGenModule.h
index bcb464b66ae..4976e3474a6 100644
--- a/clang/lib/CodeGen/CodeGenModule.h
+++ b/clang/lib/CodeGen/CodeGenModule.h
@@ -19,6 +19,8 @@
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/StringMap.h"
 
+#include "CGCall.h"
+
 namespace llvm {
   class Module;
   class Constant;
@@ -215,6 +217,18 @@ public:
   void SetMethodAttributes(const ObjCMethodDecl *MD,
                            llvm::Function *F);
 
+  void SetFunctionParamAttrs(const CGFunctionInfo &Info, 
+                             llvm::Function *F);
+
+  /// ReturnTypeUsesSret - Return true iff the given type uses 'sret'
+  /// when used as a return type.
+  bool ReturnTypeUsesSret(QualType RetTy);
+
+  void ConstructParamAttrList(const Decl *TargetDecl,
+                              const ArgTypeIterator begin,
+                              const ArgTypeIterator end,
+                              ParamAttrListType &PAL);
+
 private:
   /// SetFunctionAttributesForDefinition - Set function attributes
   /// specific to a function definition.