Address Medhi's and Tobias' comments

Author: rolfmorel

mlir/lib/Dialect/LLVMIR/IR/LLVMAttrs.cpp

@@ -375,16 +375,19 @@ TargetFeaturesAttr TargetFeaturesAttr::featuresAt(Operation *op) {
 }
 
 FailureOr<Attribute> TargetFeaturesAttr::query(DataLayoutEntryKey key) {
-  if (auto stringKey = dyn_cast<StringAttr>(key)) {
-    if (contains(stringKey))
-      return UnitAttr::get(getContext());
+  auto stringKey = dyn_cast<StringAttr>(key);
+  if (!stringKey)
+    return failure();
 
-    if (contains((std::string("+") + stringKey.strref()).str()))
-      return BoolAttr::get(getContext(), true);
+  if (contains(stringKey))
+    return UnitAttr::get(getContext());
+
+  if (contains((std::string("+") + stringKey.strref()).str()))
+    return BoolAttr::get(getContext(), true);
+
+  if (contains((std::string("-") + stringKey.strref()).str()))
+    return BoolAttr::get(getContext(), false);
 
-    if (contains((std::string("-") + stringKey.strref()).str()))
-      return BoolAttr::get(getContext(), false);
-  }
   return failure();
 }
 

mlir/lib/Target/LLVMIR/Transforms/TargetUtils.cpp

@@ -5,6 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
+
 #include "mlir/Target/LLVMIR/Transforms/Passes.h"
 
 #include "mlir/Dialect/DLTI/DLTI.h"

mlir/test/Target/LLVMIR/target-to-target-features-dlti-query.mlir

@@ -25,7 +25,6 @@ module attributes {transform.with_named_sequence} {
   }
 }
 
-
 // -----
 
 // Check that newer processor features, like AMX, are appropriated derived and queryable.