Address PR comments.

Author: tynasello

clang/lib/Sema/SemaDeclAttr.cpp

@@ -2168,12 +2168,12 @@ static ExprResult sharedGetConstructorDestructorAttrExpr(Sema &S,
       if (!E->isTypeDependent() && !E->getType()->isIntegerType()) {
         S.Diag(AL.getLoc(), diag::err_attribute_argument_type)
             << AL << AANT_ArgumentIntegerConstant << E->getSourceRange();
-        return ExprResult(/*Invalid=*/true);
+        return ExprError();
       }
     } else {
       uint32_t priority;
       if (!S.checkUInt32Argument(AL, AL.getArgAsExpr(0), priority)) {
-        return ExprResult(/*Invalid=*/true);
+        return ExprError();
       }
       return ConstantExpr::Create(S.Context, E,
                                   APValue(llvm::APSInt::getUnsigned(priority)));
@@ -2188,7 +2188,7 @@ static void handleConstructorAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
     return;
   }
   ExprResult E = sharedGetConstructorDestructorAttrExpr(S, AL);
-  if (!E.isUsable())
+  if (E.isInvalid())
     return;
   S.Diag(D->getLocation(), diag::warn_global_constructor)
       << D->getSourceRange();
@@ -2197,7 +2197,7 @@ static void handleConstructorAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
 
 static void handleDestructorAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
   ExprResult E = sharedGetConstructorDestructorAttrExpr(S, AL);
-  if (!E.isUsable())
+  if (E.isInvalid())
     return;
   S.Diag(D->getLocation(), diag::warn_global_destructor) << D->getSourceRange();
   D->addAttr(::new (S.Context) DestructorAttr(S.Context, AL, E.get()));

clang/lib/Sema/SemaTemplateInstantiateDecl.cpp

@@ -256,9 +256,7 @@ static void sharedInstantiateConstructorDestructorAttr(
       }
     }
   }
-  Attr *NewAttr = new (C) Attr(C, *A, tempInstPriority);
-  if (NewAttr)
-    New->addAttr(NewAttr);
+  New->addAttr(new (C) Attr(C, *A, tempInstPriority));
 }
 
 static Expr *instantiateDependentFunctionAttrCondition(

clang/test/AST/ast-dump-attr.cpp

@@ -89,6 +89,8 @@ __attribute__((pointer_with_type_tag(unsigned1,1,2)));
 void TestInt(void) __attribute__((constructor(123)));
 // CHECK:      FunctionDecl{{.*}}TestInt
 // CHECK-NEXT:   ConstructorAttr
+// CHECK-NEXT:   ConstantExpr
+// CHECK-NEXT:   value: Int 123
 // CHECK-NEXT:   IntegerLiteral{{.*}} 123
 
 static int TestString __attribute__((alias("alias1")));