Finish off semantic analysis for regparm, and remove the warning. Also

remove a redundant error in CodeGen.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@67868 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/AST/Attr.h b/include/clang/AST/Attr.h
index f9081050c591cbac6a082ebf8c5a96c1bb321762..2a2d0f377b15120aa067cf2153641fa6903290f0 100644 (file)
--- a/include/clang/AST/Attr.h
+++ b/include/clang/AST/Attr.h
@@ -547,9 +547,13 @@ public:
 };
 
 class RegparmAttr : public Attr {
+  unsigned NumParams;
+
 public:
-  RegparmAttr() : Attr(Regparm) {}
-    
+  RegparmAttr(unsigned np) : Attr(Regparm), NumParams(np) {}
+
+  unsigned getNumParams() { return NumParams; }
+
   // Implement isa/cast/dyncast/etc.
     
   static bool classof(const Attr *A) { return A->getKind() == Regparm; }

diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index c684f4ef52db8ee83669cb9c57ff3f3f9e6fa507..552bb9a30542e376ade256c38a2663f688ac8307 100644 (file)
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -435,6 +435,10 @@ def err_attribute_cleanup_func_must_take_one_arg : Error<
 def err_attribute_cleanup_func_arg_incompatible_type : Error<
   "'cleanup' function %0 parameter has type %1 which is incompatible with "
   "type %2">;
+def err_attribute_regparm_wrong_platform : Error<
+  "'regparm' is not valid on platforms other than x86-32">;
+def err_attribute_regparm_invalid_number : Error<
+  "'regparm' parameter must be between 0 and 3 inclusive">;
 
 
 // Clang-Specific Attributes

diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index 0759abdd33f07d45bdf2de97eb4a50502a859da7..907ade569bbcc8ca2d37c8b588a1461e0f57a441 100644 (file)
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -311,9 +311,6 @@ void CodeGenModule::SetFunctionAttributesForDefinition(const Decl *D,
   
   if (D->getAttr<NoinlineAttr>())
     F->addFnAttr(llvm::Attribute::NoInline);
-  
-  if (D->getAttr<RegparmAttr>())
-    ErrorUnsupported(D, "regparm attribute");
 }
 
 void CodeGenModule::SetMethodAttributes(const ObjCMethodDecl *MD,

diff --git a/lib/Sema/SemaDeclAttr.cpp b/lib/Sema/SemaDeclAttr.cpp
index c8d98cf0dcb6a763f4b67b0abe4f3784b6bf2635..40e4971d2b8808fb6ac5fd795ed75e3dccc712ae 100644 (file)
--- a/lib/Sema/SemaDeclAttr.cpp
+++ b/lib/Sema/SemaDeclAttr.cpp
@@ -1447,17 +1447,39 @@ static void HandleNoinlineAttr(Decl *d, const AttributeList &Attr, Sema &S) {
 static void HandleRegparmAttr(Decl *d, const AttributeList &Attr, Sema &S) {
   // check the attribute arguments.
   if (Attr.getNumArgs() != 1) {
-    S.Diag(Attr.getLoc(), diag::err_attribute_wrong_number_arguments) << 0;
+    S.Diag(Attr.getLoc(), diag::err_attribute_wrong_number_arguments) << 1;
     return;
   }
-  
+
   if (!isFunctionOrMethod(d)) {
     S.Diag(Attr.getLoc(), diag::warn_attribute_wrong_decl_type)
     << "regparm" << 0 /*function*/;
     return;
   }
-  
-  d->addAttr(::new (S.Context) RegparmAttr());
+
+  Expr *NumParamsExpr = static_cast<Expr *>(Attr.getArg(0));
+  llvm::APSInt NumParams(32);
+  if (!NumParamsExpr->isIntegerConstantExpr(NumParams, S.Context)) {
+    S.Diag(Attr.getLoc(), diag::err_attribute_argument_not_int)
+      << "regparm" << NumParamsExpr->getSourceRange();
+    return;
+  }
+
+  if (NumParams.getLimitedValue(4) > 3) {
+    S.Diag(Attr.getLoc(), diag::err_attribute_regparm_invalid_number)
+      << NumParamsExpr->getSourceRange();
+    return;
+  }
+
+  const char *TargetPrefix = S.Context.Target.getTargetPrefix();
+  unsigned PointerWidth = S.Context.Target.getPointerWidth(0);
+  if (strcmp(TargetPrefix, "x86") || PointerWidth != 32) {
+    S.Diag(Attr.getLoc(), diag::err_attribute_regparm_wrong_platform)
+      << NumParamsExpr->getSourceRange();
+    return;
+  }
+
+  d->addAttr(::new (S.Context) RegparmAttr(NumParams.getZExtValue()));
 }
 
 //===----------------------------------------------------------------------===//
@@ -1520,10 +1542,7 @@ static void ProcessDeclAttribute(Decl *D, const AttributeList &Attr, Sema &S) {
   case AttributeList::AT_cleanup:     HandleCleanupAttr   (D, Attr, S); break;
   case AttributeList::AT_nodebug:     HandleNodebugAttr   (D, Attr, S); break;
   case AttributeList::AT_noinline:    HandleNoinlineAttr  (D, Attr, S); break;
-  case AttributeList::AT_regparm:
-    HandleRegparmAttr  (D, Attr, S);
-    S.Diag(Attr.getLoc(), diag::warn_attribute_ignored) << Attr.getName();
-    break;
+  case AttributeList::AT_regparm:     HandleRegparmAttr   (D, Attr, S); break;
   case AttributeList::IgnoredAttribute: 
     // Just ignore
     break;

diff --git a/test/Sema/attr-regparm.c b/test/Sema/attr-regparm.c
new file mode 100644 (file)
index 0000000..944f014
--- /dev/null
+++ b/test/Sema/attr-regparm.c
@@ -0,0 +1,7 @@
+// RUN: clang-cc -triple i386-apple-darwin9 -fsyntax-only -verify %s
+
+__attribute((regparm(2))) int x(void);
+__attribute((regparm(1.0))) int x(void); // expected-error{{'regparm' attribute requires integer constant}}
+__attribute((regparm(-1))) int x(void); // expected-error{{'regparm' parameter must be between 0 and 3 inclusive}}
+__attribute((regparm(5))) int x(void); // expected-error{{'regparm' parameter must be between 0 and 3 inclusive}}
+__attribute((regparm(5,3))) int x(void); // expected-error{{attribute requires 1 argument(s)}}