Addressed comments

Author: grigorypas

clang/lib/CodeGen/CodeGenModule.cpp

@@ -2752,12 +2752,10 @@ void CodeGenModule::SetLLVMFunctionAttributesForDefinition(const Decl *D,
   }
 
   // Handle flatten_depth attribute for depth-based inlining
-  if (const auto *FD = dyn_cast<FunctionDecl>(D)) {
-    if (const FlattenDepthAttr *FDA = FD->getAttr<FlattenDepthAttr>()) {
-      // Add the flatten_depth attribute with the max depth value as a typed int
-      // attribute
-      B.addRawIntAttr(llvm::Attribute::FlattenDepth, FDA->getDepthHint());
-    }
+  if (const FlattenDepthAttr *FDA = D->getAttr<FlattenDepthAttr>()) {
+    // Add the flatten_depth attribute with the max depth value as a typed int
+    // attribute
+    B.addFlattenDepthAttr(FDA->getDepthHint());
   }
 
   // Track whether we need to add the optnone LLVM attribute,

clang/lib/Sema/SemaDeclAttr.cpp

@@ -3699,18 +3699,16 @@ static void handleFlattenDepthAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
   Expr *E = AL.getArgAsExpr(0);
   uint32_t depthHint;
   if (!S.checkUInt32Argument(AL, E, depthHint)) {
-    AL.setInvalid();
     return;
   }
 
   if (depthHint == 0) {
     S.Diag(AL.getLoc(), diag::err_attribute_argument_is_zero)
         << AL << E->getSourceRange();
-    AL.setInvalid();
     return;
   }
 
-  D->addAttr(::new (S.Context) FlattenDepthAttr(S.Context, AL, depthHint));
+  D->addAttr(FlattenDepthAttr::Create(S.Context, depthHint, AL));
 }
 
 ErrorAttr *Sema::mergeErrorAttr(Decl *D, const AttributeCommonInfo &CI,