From: Sunil Srivastava Date: Tue, 14 Jul 2015 18:08:50 +0000 (+0000) Subject: Fixed 22941: Integer template parameter as immediate 'I' expectes an integer constant X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b050e72e6be90ed5b1ed9ec7c7a8424988471062;p=clang Fixed 22941: Integer template parameter as immediate 'I' expectes an integer constant Basically fixed premature testing of integer constraints during template parsing Reviewed at http://reviews.llvm.org/D10452 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@242175 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Sema/SemaStmtAsm.cpp b/lib/Sema/SemaStmtAsm.cpp index d19d8819d8..8e3e89f1e5 100644 --- a/lib/Sema/SemaStmtAsm.cpp +++ b/lib/Sema/SemaStmtAsm.cpp @@ -254,17 +254,19 @@ StmtResult Sema::ActOnGCCAsmStmt(SourceLocation AsmLoc, bool IsSimple, << Info.getConstraintStr() << InputExpr->getSourceRange()); } else if (Info.requiresImmediateConstant() && !Info.allowsRegister()) { - llvm::APSInt Result; - if (!InputExpr->EvaluateAsInt(Result, Context)) - return StmtError( - Diag(InputExpr->getLocStart(), diag::err_asm_immediate_expected) - << Info.getConstraintStr() << InputExpr->getSourceRange()); - if (Result.slt(Info.getImmConstantMin()) || - Result.sgt(Info.getImmConstantMax())) - return StmtError(Diag(InputExpr->getLocStart(), - diag::err_invalid_asm_value_for_constraint) - << Result.toString(10) << Info.getConstraintStr() - << InputExpr->getSourceRange()); + if (!InputExpr->isValueDependent()) { + llvm::APSInt Result; + if (!InputExpr->EvaluateAsInt(Result, Context)) + return StmtError( + Diag(InputExpr->getLocStart(), diag::err_asm_immediate_expected) + << Info.getConstraintStr() << InputExpr->getSourceRange()); + if (Result.slt(Info.getImmConstantMin()) || + Result.sgt(Info.getImmConstantMax())) + return StmtError(Diag(InputExpr->getLocStart(), + diag::err_invalid_asm_value_for_constraint) + << Result.toString(10) << Info.getConstraintStr() + << InputExpr->getSourceRange()); + } } else { ExprResult Result = DefaultFunctionArrayLvalueConversion(Exprs[i]); diff --git a/test/Sema/inline-asm-validate-tmpl.cpp b/test/Sema/inline-asm-validate-tmpl.cpp new file mode 100644 index 0000000000..cf7eac3d83 --- /dev/null +++ b/test/Sema/inline-asm-validate-tmpl.cpp @@ -0,0 +1,25 @@ +// RUN: %clang_cc1 -triple i686 -fsyntax-only -verify %s +// RUN: %clang_cc1 -triple x86_64 -fsyntax-only -verify %s + + +// this template, when instantiated with 300, violates the range contraint +template void test(int value) +{ + asm("rol %1, %0" :"=r"(value): "I"(N + 1)); // expected-error{{value '301' out of range for constraint 'I'}} +} + +int main() { test<300>(10); } // expected-note{{in instantiation of function template specialization 'test<300>' requested here}} + + +// this template is not used, but the error is detectable +template void testb(int value) +{ + asm("rol %1, %0" :"=r"(value): "I"(301)); // expected-error{{value '301' out of range for constraint 'I'}} +} + +// these should compile without error +template void testc(int value) +{ + asm("rol %1, %0" :"=r"(value): "I"(N + 1)); +} +int foo() { testc<2>(10); }