diff --git a/llvm/lib/Target/AMDGPU/AMDGPUAttributor.cpp b/llvm/lib/Target/AMDGPU/AMDGPUAttributor.cpp
index ff8b9537c45ce..bd913b88d759b 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUAttributor.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUAttributor.cpp
@@ -397,7 +397,10 @@ struct AAAMDAttributesFunction : public AAAMDAttributes {
       }
     }
 
-    NeedsQueuePtr |= checkForQueuePtr(A);
+    if (!NeedsQueuePtr) {
+      NeedsQueuePtr = checkForQueuePtr(A);
+    }
+
     if (NeedsQueuePtr) {
       removeAssumedBits(QUEUE_PTR);
     }