diff options
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Basic/Targets.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaDeclAttr.cpp | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp index 5f5ba60e858..40bc31381d1 100644 --- a/clang/lib/Basic/Targets.cpp +++ b/clang/lib/Basic/Targets.cpp @@ -633,6 +633,7 @@ public: SizeType = UnsignedInt; PtrDiffType = SignedInt; IntPtrType = SignedInt; + RegParmMax = 3; } virtual const char *getVAListDeclaration() const { return "typedef char* __builtin_va_list;"; @@ -762,6 +763,7 @@ public: LongDoubleAlign = 128; IntMaxType = SignedLong; UIntMaxType = UnsignedLong; + RegParmMax = 6; DescriptionString = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-" "i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-" diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp index 40e4971d2b8..a68ddf6c003 100644 --- a/clang/lib/Sema/SemaDeclAttr.cpp +++ b/clang/lib/Sema/SemaDeclAttr.cpp @@ -1465,17 +1465,16 @@ static void HandleRegparmAttr(Decl *d, const AttributeList &Attr, Sema &S) { return; } - if (NumParams.getLimitedValue(4) > 3) { - S.Diag(Attr.getLoc(), diag::err_attribute_regparm_invalid_number) + if (S.Context.Target.getRegParmMax() == 0) { + S.Diag(Attr.getLoc(), diag::err_attribute_regparm_wrong_platform) << 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(); + // FIXME: we need to honour command line settings also... + if (NumParams.getLimitedValue(4) > S.Context.Target.getRegParmMax()) { + S.Diag(Attr.getLoc(), diag::err_attribute_regparm_invalid_number) + << S.Context.Target.getRegParmMax() << NumParamsExpr->getSourceRange(); return; } |
