intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-02-02 02:00:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
remove a redundant error in CodeGen.

llvm-svn: 67868
This commit is contained in:
Eli Friedman
2009-03-27 21:06:47 +00:00
parent 6ecb5afcd6
commit 7044b76707
5 changed files with 44 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
clang/include/clang/AST/Attr.h
View File

@@ -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; }

4
clang/include/clang/Basic/DiagnosticSemaKinds.td
View File

@@ -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

3
clang/lib/CodeGen/CodeGenModule.cpp
View File

@@ -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,

35
clang/lib/Sema/SemaDeclAttr.cpp
View File

@@ -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;

7
clang/test/Sema/attr-regparm.c Normal file
View File

@@ -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)}}