s/FP_AlwaysInline/FN_NOTE_AlwaysInline/g

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@55676 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 7 insertions, 7 deletions

diff --git a/include/llvm/Function.h b/include/llvm/Function.h
index 58edab480a..d47746d161 100644
--- a/include/llvm/Function.h
+++ b/include/llvm/Function.h
@@ -52,10 +52,10 @@ template<> struct ilist_traits<Argument>
 };
 
 typedef unsigned FunctionNotes;
-const FunctionNotes FP_None            = 0;   
-const FunctionNotes FP_NoInline        = 1<<0;
-const FunctionNotes FP_AlwaysInline    = 1<<1;
-const FunctionNotes FP_OptimizeForSize = 1<<2;
+const FunctionNotes FN_NOTE_None            = 0;   
+const FunctionNotes FN_NOTE_NoInline        = 1<<0;
+const FunctionNotes FN_NOTE_AlwaysInline    = 1<<1;
+const FunctionNotes FN_NOTE_OptimizeForSize = 1<<2;
 
 class Function : public GlobalValue, public Annotable,
                  public ilist_node<Function> {
@@ -155,13 +155,13 @@ public:
   ///
   void setParamAttrs(const PAListPtr &attrs) { ParamAttrs = attrs; }
 
-  /// getNotes - Return this function properties
+  /// getNotes - Return function notes
   ///
   const FunctionNotes &getNotes() const { return Notes; }
 
-  /// setNotes - Set properties for this function
+  /// setNotes - Set notes for this function
   ///
-  void setNotes(const FunctionNotes P) { Notes = P;}
+  void setNotes(const FunctionNotes P) { Notes = Notes | P;}
 
   /// hasGC/getGC/setGC/clearGC - The name of the garbage collection algorithm
   ///                             to use during code generation.