diff --git a/clang/include/clang/Support/RISCVVIntrinsicUtils.h b/clang/include/clang/Support/RISCVVIntrinsicUtils.h
--- a/clang/include/clang/Support/RISCVVIntrinsicUtils.h
+++ b/clang/include/clang/Support/RISCVVIntrinsicUtils.h
@@ -122,11 +122,11 @@
   }
 
   bool isTAPolicy() const {
-    return TailPolicy == Agnostic && MaskPolicy == Omit;
+    return TailPolicy == Agnostic;
   }
 
   bool isTUPolicy() const {
-    return TailPolicy == Undisturbed && MaskPolicy == Omit;
+    return TailPolicy == Undisturbed;
   }
 
   bool isMAPolicy() const {