[cfe-commits] r67031 - in /cfe/trunk: Driver/PrintParserCallbacks.cpp include/clang/AST/DeclCXX.h include/clang/Parse/Action.h lib/Parse/ParseDeclCXX.cpp lib/Sema/Sema.h lib/Sema/SemaDeclCXX.cpp lib/Sema/SemaTemplateInstantiate.cpp test/SemaCXX/static-assert.cpp
Anders Carlsson
andersca at mac.com
Sun Mar 15 11:44:04 PDT 2009
Author: andersca
Date: Sun Mar 15 13:44:04 2009
New Revision: 67031
URL: http://llvm.org/viewvc/llvm-project?rev=67031&view=rev
Log:
Handle static_asserts when instantiating structs.
Modified:
cfe/trunk/Driver/PrintParserCallbacks.cpp
cfe/trunk/include/clang/AST/DeclCXX.h
cfe/trunk/include/clang/Parse/Action.h
cfe/trunk/lib/Parse/ParseDeclCXX.cpp
cfe/trunk/lib/Sema/Sema.h
cfe/trunk/lib/Sema/SemaDeclCXX.cpp
cfe/trunk/lib/Sema/SemaTemplateInstantiate.cpp
cfe/trunk/test/SemaCXX/static-assert.cpp
Modified: cfe/trunk/Driver/PrintParserCallbacks.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Driver/PrintParserCallbacks.cpp?rev=67031&r1=67030&r2=67031&view=diff
==============================================================================
--- cfe/trunk/Driver/PrintParserCallbacks.cpp (original)
+++ cfe/trunk/Driver/PrintParserCallbacks.cpp Sun Mar 15 13:44:04 2009
@@ -724,8 +724,7 @@
virtual DeclTy *ActOnStaticAssertDeclaration(SourceLocation AssertLoc,
ExprArg AssertExpr,
- ExprArg AssertMessageExpr,
- SourceLocation RParenLoc) {
+ ExprArg AssertMessageExpr) {
llvm::cout << __FUNCTION__ << "\n";
return 0;
}
Modified: cfe/trunk/include/clang/AST/DeclCXX.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DeclCXX.h?rev=67031&r1=67030&r2=67031&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/DeclCXX.h (original)
+++ cfe/trunk/include/clang/AST/DeclCXX.h Sun Mar 15 13:44:04 2009
@@ -887,20 +887,24 @@
};
class StaticAssertDecl : public Decl {
- SourceLocation AssertLoc;
-
Expr *AssertExpr;
StringLiteral *Message;
-
+
StaticAssertDecl(DeclContext *DC, SourceLocation L,
Expr *assertexpr, StringLiteral *message)
- : Decl(StaticAssert, DC, L), AssertExpr(assertexpr), Message(message) { }
+ : Decl(StaticAssert, DC, L), AssertExpr(assertexpr), Message(message) { }
public:
static StaticAssertDecl *Create(ASTContext &C, DeclContext *DC,
SourceLocation L, Expr *AssertExpr,
StringLiteral *Message);
+ Expr *getAssertExpr() { return AssertExpr; }
+ const Expr *getAssertExpr() const { return AssertExpr; }
+
+ StringLiteral *getMessage() { return Message; }
+ const StringLiteral *getMessage() const { return Message; }
+
virtual ~StaticAssertDecl();
virtual void Destroy(ASTContext& C);
Modified: cfe/trunk/include/clang/Parse/Action.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Parse/Action.h?rev=67031&r1=67030&r2=67031&view=diff
==============================================================================
--- cfe/trunk/include/clang/Parse/Action.h (original)
+++ cfe/trunk/include/clang/Parse/Action.h Sun Mar 15 13:44:04 2009
@@ -893,8 +893,7 @@
/// ActOnStaticAssertDeclaration - Parse a C++0x static_assert declaration.
virtual DeclTy *ActOnStaticAssertDeclaration(SourceLocation AssertLoc,
ExprArg AssertExpr,
- ExprArg AssertMessageExpr,
- SourceLocation RParenLoc) {
+ ExprArg AssertMessageExpr) {
return 0;
}
Modified: cfe/trunk/lib/Parse/ParseDeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseDeclCXX.cpp?rev=67031&r1=67030&r2=67031&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseDeclCXX.cpp (original)
+++ cfe/trunk/lib/Parse/ParseDeclCXX.cpp Sun Mar 15 13:44:04 2009
@@ -252,13 +252,12 @@
if (AssertMessage.isInvalid())
return 0;
- SourceLocation RParenLoc = MatchRHSPunctuation(tok::r_paren, LParenLoc);
+ MatchRHSPunctuation(tok::r_paren, LParenLoc);
ExpectAndConsume(tok::semi, diag::err_expected_semi_after_static_assert);
return Actions.ActOnStaticAssertDeclaration(StaticAssertLoc, move(AssertExpr),
- move(AssertMessage),
- RParenLoc);
+ move(AssertMessage));
}
/// ParseClassName - Parse a C++ class-name, which names a class. Note
Modified: cfe/trunk/lib/Sema/Sema.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/Sema.h?rev=67031&r1=67030&r2=67031&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/Sema.h (original)
+++ cfe/trunk/lib/Sema/Sema.h Sun Mar 15 13:44:04 2009
@@ -1562,8 +1562,7 @@
virtual DeclTy *ActOnStaticAssertDeclaration(SourceLocation AssertLoc,
ExprArg AssertExpr,
- ExprArg AssertMessageExpr,
- SourceLocation RParenLoc);
+ ExprArg AssertMessageExpr);
bool CheckConstructorDeclarator(Declarator &D, QualType &R,
FunctionDecl::StorageClass& SC);
Modified: cfe/trunk/lib/Sema/SemaDeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclCXX.cpp?rev=67031&r1=67030&r2=67031&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclCXX.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclCXX.cpp Sun Mar 15 13:44:04 2009
@@ -2238,8 +2238,7 @@
Sema::DeclTy *Sema::ActOnStaticAssertDeclaration(SourceLocation AssertLoc,
ExprArg assertexpr,
- ExprArg assertmessageexpr,
- SourceLocation RParenLoc) {
+ ExprArg assertmessageexpr) {
Expr *AssertExpr = (Expr *)assertexpr.get();
StringLiteral *AssertMessage =
cast<StringLiteral>((Expr *)assertmessageexpr.get());
@@ -2255,7 +2254,8 @@
if (Value == 0) {
std::string str(AssertMessage->getStrData(),
AssertMessage->getByteLength());
- Diag(AssertLoc, diag::err_static_assert_failed) << str;
+ Diag(AssertLoc, diag::err_static_assert_failed)
+ << str << AssertExpr->getSourceRange();
}
}
Modified: cfe/trunk/lib/Sema/SemaTemplateInstantiate.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaTemplateInstantiate.cpp?rev=67031&r1=67030&r2=67031&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaTemplateInstantiate.cpp (original)
+++ cfe/trunk/lib/Sema/SemaTemplateInstantiate.cpp Sun Mar 15 13:44:04 2009
@@ -1071,6 +1071,25 @@
if (New->isInvalidDecl())
Invalid = true;
}
+ } else if (StaticAssertDecl *SA = dyn_cast<StaticAssertDecl>(*Member)) {
+ Expr *AssertExpr = SA->getAssertExpr();
+
+ OwningExprResult InstantiatedAssertExpr
+ = InstantiateExpr(AssertExpr,
+ ClassTemplateSpec->getTemplateArgs(),
+ ClassTemplateSpec->getNumTemplateArgs());
+ if (!InstantiatedAssertExpr.isInvalid()) {
+ OwningExprResult Message = Clone(SA->getMessage());
+
+ Decl *New =
+ (Decl *)ActOnStaticAssertDeclaration(SA->getLocation(),
+ move(InstantiatedAssertExpr),
+ move(Message));
+ if (New->isInvalidDecl())
+ Invalid = true;
+
+ } else
+ Invalid = true;
}
}
Modified: cfe/trunk/test/SemaCXX/static-assert.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/static-assert.cpp?rev=67031&r1=67030&r2=67031&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/static-assert.cpp (original)
+++ cfe/trunk/test/SemaCXX/static-assert.cpp Sun Mar 15 13:44:04 2009
@@ -15,10 +15,16 @@
};
template<int N> struct T {
- static_assert(N == 2, "N is not 2!");
+ static_assert(N == 2, "N is not 2!"); // expected-error {{static_assert failed "N is not 2!"}}
};
+T<1> t1; // expected-note {{in instantiation of template class 'struct T<1>' requested here}}
+T<2> t2;
+
template<typename T> struct S {
- static_assert(sizeof(T) > sizeof(char), "Type not big enough!");
+ static_assert(sizeof(T) > sizeof(char), "Type not big enough!"); // expected-error {{static_assert failed "Type not big enough!"}}
};
+S<char> s1; // expected-note {{in instantiation of template class 'struct S<char>' requested here}}
+S<int> s2;
+
More information about the cfe-commits
mailing list