2 files changed, 13 insertions, 8 deletions
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
index 077c02384a7..096e87d8b7e 100644
--- a/clang/lib/CodeGen/CodeGenModule.cpp
+++ b/clang/lib/CodeGen/CodeGenModule.cpp
@@ -304,9 +304,9 @@ void CodeGenModule::SetGlobalValueAttributes(const Decl *D,
     GV->setSection(SA->getName());
 }
 
-void CodeGenModule::SetFunctionAttributes(const Decl *D,
-                                          const CGFunctionInfo &Info, 
-                                          llvm::Function *F) {
+void CodeGenModule::SetLLVMFunctionAttributes(const Decl *D,
+                                              const CGFunctionInfo &Info, 
+                                              llvm::Function *F) {
   AttributeListType AttributeList;
   ConstructAttributeList(Info, D, AttributeList);
 
@@ -360,14 +360,14 @@ void CodeGenModule::SetFunctionAttributesForDefinition(const Decl *D,
 
 void CodeGenModule::SetMethodAttributes(const ObjCMethodDecl *MD,
                                         llvm::Function *F) {
-  SetFunctionAttributes(MD, getTypes().getFunctionInfo(MD), F);
+  SetLLVMFunctionAttributes(MD, getTypes().getFunctionInfo(MD), F);
   
   SetFunctionAttributesForDefinition(MD, F);
 }
 
 void CodeGenModule::SetFunctionAttributes(const FunctionDecl *FD,
                                           llvm::Function *F) {
-  SetFunctionAttributes(FD, getTypes().getFunctionInfo(FD), F);
+  SetLLVMFunctionAttributes(FD, getTypes().getFunctionInfo(FD), F);
   
   SetGlobalValueAttributes(FD, GetLinkageForFunctionOrMethodDecl(FD), F, false);
 }
diff --git a/clang/lib/CodeGen/CodeGenModule.h b/clang/lib/CodeGen/CodeGenModule.h
index 8b748cb762a..b38633db91d 100644
--- a/clang/lib/CodeGen/CodeGenModule.h
+++ b/clang/lib/CodeGen/CodeGenModule.h
@@ -292,9 +292,11 @@ public:
   void SetMethodAttributes(const ObjCMethodDecl *MD,
                            llvm::Function *F);
 
-  void SetFunctionAttributes(const Decl *D,
-                             const CGFunctionInfo &Info,
-                             llvm::Function *F);
+  /// SetLLVMFunctionAttributes - Set the LLVM function attributes
+  /// (sext, zext, etc).
+  void SetLLVMFunctionAttributes(const Decl *D,
+                                 const CGFunctionInfo &Info,
+                                 llvm::Function *F);
 
   /// ReturnTypeUsesSret - Return true iff the given type uses 'sret' when used
   /// as a return type.
@@ -329,10 +331,13 @@ private:
     
   /// SetFunctionAttributesForDefinition - Set function attributes specific to a
   /// function definition.
+  ///
   /// \param D - The ObjCMethodDecl or FunctionDecl defining \arg F.
   void SetFunctionAttributesForDefinition(const Decl *D,
                                           llvm::Function *F);
 
+  /// SetFunctionAttributes - Set function attributes for a function
+  /// declaration.
   void SetFunctionAttributes(const FunctionDecl *FD,
                              llvm::Function *F);