s/ModAttrBehavior/ModFlagBehavior/g to be consistent with how module flags are named...

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

diff --git a/include/llvm/Module.h b/include/llvm/Module.h
index c331837f818878a189be3381d87ba2fec997b8d7..4ca8fdee5c6c79552d4c014721f8c8c0a66dc3e5 100644 (file)
--- a/include/llvm/Module.h
+++ b/include/llvm/Module.h
@@ -177,13 +177,13 @@ public:
   ///                   is an error for two (or more) llvm.module.flags with the
   ///                   same ID to have the Override behavior but different
   ///                   values.
-  enum ModAttrBehavior { Error = 1, Warning  = 2, Require = 3, Override = 4 };
+  enum ModFlagBehavior { Error = 1, Warning  = 2, Require = 3, Override = 4 };
 
   struct ModuleFlagEntry {
-    ModAttrBehavior Behavior;
+    ModFlagBehavior Behavior;
     MDString *Key;
     Value *Val;
-    ModuleFlagEntry(ModAttrBehavior B, MDString *K, Value *V)
+    ModuleFlagEntry(ModFlagBehavior B, MDString *K, Value *V)
       : Behavior(B), Key(K), Val(V) {}
   };
 
@@ -425,8 +425,8 @@ public:
   /// addModuleFlag - Add a module-level flag to the module-level flags
   /// metadata. It will create the module-level flags named metadata if it
   /// doesn't already exist.
-  void addModuleFlag(ModAttrBehavior Behavior, StringRef Key, Value *Val);
-  void addModuleFlag(ModAttrBehavior Behavior, StringRef Key, uint32_t Val);
+  void addModuleFlag(ModFlagBehavior Behavior, StringRef Key, Value *Val);
+  void addModuleFlag(ModFlagBehavior Behavior, StringRef Key, uint32_t Val);
   void addModuleFlag(MDNode *Node);
 
 /// @}

diff --git a/lib/VMCore/Module.cpp b/lib/VMCore/Module.cpp
index cc6ae0e000f76f09cfc21402d5e8cf7daa5621c1..e8bc6dbe97065f4702b2a80a09107ec79b0cc9de 100644 (file)
--- a/lib/VMCore/Module.cpp
+++ b/lib/VMCore/Module.cpp
@@ -339,7 +339,7 @@ getModuleFlagsMetadata(SmallVectorImpl<ModuleFlagEntry> &Flags) const {
     ConstantInt *Behavior = cast<ConstantInt>(Flag->getOperand(0));
     MDString *Key = cast<MDString>(Flag->getOperand(1));
     Value *Val = Flag->getOperand(2);
-    Flags.push_back(ModuleFlagEntry(ModAttrBehavior(Behavior->getZExtValue()),
+    Flags.push_back(ModuleFlagEntry(ModFlagBehavior(Behavior->getZExtValue()),
                                     Key, Val));
   }
 }
@@ -361,7 +361,7 @@ NamedMDNode *Module::getOrInsertModuleFlagsMetadata() {
 /// addModuleFlag - Add a module-level flag to the module-level flags
 /// metadata. It will create the module-level flags named metadata if it doesn't
 /// already exist.
-void Module::addModuleFlag(ModAttrBehavior Behavior, StringRef Key,
+void Module::addModuleFlag(ModFlagBehavior Behavior, StringRef Key,
                            Value *Val) {
   Type *Int32Ty = Type::getInt32Ty(Context);
   Value *Ops[3] = {
@@ -369,7 +369,7 @@ void Module::addModuleFlag(ModAttrBehavior Behavior, StringRef Key,
   };
   getOrInsertModuleFlagsMetadata()->addOperand(MDNode::get(Context, Ops));
 }
-void Module::addModuleFlag(ModAttrBehavior Behavior, StringRef Key,
+void Module::addModuleFlag(ModFlagBehavior Behavior, StringRef Key,
                            uint32_t Val) {
   Type *Int32Ty = Type::getInt32Ty(Context);
   addModuleFlag(Behavior, Key, ConstantInt::get(Int32Ty, Val));