Index: llvm/trunk/lib/Target/AMDGPU/SIModeRegister.cpp
===================================================================
--- llvm/trunk/lib/Target/AMDGPU/SIModeRegister.cpp
+++ llvm/trunk/lib/Target/AMDGPU/SIModeRegister.cpp
@@ -44,7 +44,7 @@
 
   Status() : Mask(0), Mode(0){};
 
-  Status(unsigned Mask, unsigned Mode) : Mask(Mask), Mode(Mode) {
+  Status(unsigned NewMask, unsigned NewMode) : Mask(NewMask), Mode(NewMode) {
     Mode &= Mask;
   };