1 files changed, 2 insertions, 10 deletions
diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp b/clang/lib/CodeGen/CodeGenFunction.cpp
index 551db09..1e98bea 100644
--- a/clang/lib/CodeGen/CodeGenFunction.cpp
+++ b/clang/lib/CodeGen/CodeGenFunction.cpp
@@ -2797,16 +2797,8 @@ void CodeGenFunction::EmitKCFIOperandBundle(
 llvm::Value *CodeGenFunction::FormAArch64ResolverCondition(
     const MultiVersionResolverOption &RO) {
   llvm::SmallVector<StringRef, 8> CondFeatures;
-  for (const StringRef &Feature : RO.Conditions.Features) {
-    // Optimize the Function Multi Versioning resolver by creating conditions
-    // only for features that are not enabled in the target. The exception is
-    // for features whose extension instructions are executed as NOP on targets
-    // without extension support.
-    if (!getContext().getTargetInfo().hasFeature(Feature) || Feature == "bti" ||
-        Feature == "memtag" || Feature == "memtag2" || Feature == "memtag3" ||
-        Feature == "dgh")
-      CondFeatures.push_back(Feature);
-  }
+  for (const StringRef &Feature : RO.Conditions.Features)
+    CondFeatures.push_back(Feature);
   if (!CondFeatures.empty()) {
     return EmitAArch64CpuSupports(CondFeatures);
   }