Rename operator |= as merge

Author: bharadwajy

llvm/lib/Target/DirectX/DXILShaderFlags.cpp

@@ -83,7 +83,7 @@ DXILModuleShaderFlagsInfo::DXILModuleShaderFlagsInfo(const Module &M) {
     // Insert shader flag mask for function F
     FunctionFlags.push_back({&F, CSF});
     // Update combined shader flags mask
-    CombinedSFMask |= CSF;
+    CombinedSFMask.merge(CSF);
   }
   llvm::sort(FunctionFlags);
 }

llvm/lib/Target/DirectX/DXILShaderFlags.h

@@ -70,13 +70,13 @@ struct ComputedShaderFlags {
     return ModuleFlags;
   }
 
-  ComputedShaderFlags &operator|=(const uint64_t IVal) {
+  void merge(const uint64_t IVal) {
 #define SHADER_FEATURE_FLAG(FeatureBit, DxilModuleBit, FlagName, Str)          \
   FlagName |= (IVal & getMask(DxilModuleBit));
 #define DXIL_MODULE_FLAG(DxilModuleBit, FlagName, Str)                         \
   FlagName |= (IVal & getMask(DxilModuleBit));
 #include "llvm/BinaryFormat/DXContainerConstants.def"
-    return *this;
+    return;
   }
 
   void print(raw_ostream &OS = dbgs()) const;