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
@@ -126,13 +126,9 @@
     return TailPolicy == Undisturbed && MaskPolicy == Undisturbed;
   }
 
-  bool isTAPolicy() const {
-    return TailPolicy == Agnostic && MaskPolicy == Omit;
-  }
+  bool isTAPolicy() const { return TailPolicy == Agnostic; }
 
-  bool isTUPolicy() const {
-    return TailPolicy == Undisturbed && MaskPolicy == Omit;
-  }
+  bool isTUPolicy() const { return TailPolicy == Undisturbed; }
 
   bool isMAPolicy() const { return MaskPolicy == Agnostic; }