From: Douglas Gregor Date: Mon, 18 May 2009 22:38:38 +0000 (+0000) Subject: Template instantiation for imaginary literals, because they were next in Expr.h X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d8ac436c8c10c52c937ba323db582259ceb06197;p=clang Template instantiation for imaginary literals, because they were next in Expr.h git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@72058 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/AST/Expr.h b/include/clang/AST/Expr.h index c7dfffce9f..0c5f63b509 100644 --- a/include/clang/AST/Expr.h +++ b/include/clang/AST/Expr.h @@ -523,6 +523,8 @@ public: Expr *getSubExpr() { return cast(Val); } void setSubExpr(Expr *E) { Val = E; } + ImaginaryLiteral* Clone(ASTContext &C) const; + virtual SourceRange getSourceRange() const { return Val->getSourceRange(); } static bool classof(const Stmt *T) { return T->getStmtClass() == ImaginaryLiteralClass; diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp index 19ab835707..6bafdf278d 100644 --- a/lib/AST/Expr.cpp +++ b/lib/AST/Expr.cpp @@ -44,6 +44,16 @@ FloatingLiteral* FloatingLiteral::Clone(ASTContext &C) const { return new (C) FloatingLiteral(Value, &exact, getType(), Loc); } +ImaginaryLiteral* ImaginaryLiteral::Clone(ASTContext &C) const { + // FIXME: Use virtual Clone(), once it is available + Expr *ClonedVal = 0; + if (const IntegerLiteral *IntLit = dyn_cast(Val)) + ClonedVal = IntLit->Clone(C); + else + ClonedVal = cast(Val)->Clone(C); + return new (C) ImaginaryLiteral(ClonedVal, getType()); +} + GNUNullExpr* GNUNullExpr::Clone(ASTContext &C) const { return new (C) GNUNullExpr(getType(), TokenLoc); } diff --git a/lib/Sema/SemaTemplateInstantiateExpr.cpp b/lib/Sema/SemaTemplateInstantiateExpr.cpp index 3c3fb7e98e..c6ce6f4693 100644 --- a/lib/Sema/SemaTemplateInstantiateExpr.cpp +++ b/lib/Sema/SemaTemplateInstantiateExpr.cpp @@ -41,6 +41,7 @@ namespace { OwningExprResult VisitFloatingLiteral(FloatingLiteral *E); OwningExprResult VisitStringLiteral(StringLiteral *E); OwningExprResult VisitCharacterLiteral(CharacterLiteral *E); + OwningExprResult VisitImaginaryLiteral(ImaginaryLiteral *E); OwningExprResult VisitDeclRefExpr(DeclRefExpr *E); OwningExprResult VisitParenExpr(ParenExpr *E); OwningExprResult VisitUnaryOperator(UnaryOperator *E); @@ -91,6 +92,11 @@ TemplateExprInstantiator::VisitCharacterLiteral(CharacterLiteral *E) { return SemaRef.Clone(E); } +Sema::OwningExprResult +TemplateExprInstantiator::VisitImaginaryLiteral(ImaginaryLiteral *E) { + return SemaRef.Clone(E); +} + Sema::OwningExprResult TemplateExprInstantiator::VisitCXXBoolLiteralExpr(CXXBoolLiteralExpr *E) { return SemaRef.Clone(E); diff --git a/test/SemaTemplate/instantiate-expr-3.cpp b/test/SemaTemplate/instantiate-expr-3.cpp new file mode 100644 index 0000000000..cf6139d0ce --- /dev/null +++ b/test/SemaTemplate/instantiate-expr-3.cpp @@ -0,0 +1,11 @@ +// RUN: clang-cc -fsyntax-only -verify %s + +template +struct ImaginaryLiteral0 { + void f(T &x) { + x = 3.0I; // expected-error{{incompatible type}} + } +}; + +template struct ImaginaryLiteral0<_Complex float>; +template struct ImaginaryLiteral0; // expected-note{{instantiation}}