maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Add hack to make the given testcase work. As far as I can tell, this change is 

reasonably safe, but it doesn't seem like the right solution.

llvm-svn: 86508
This commit is contained in:
Eli Friedman 2009-11-09 03:59:26 +00:00
parent e5eb726e2e
commit cb29876839
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
View File

@ -188,11 +188,13 @@ Decl *TemplateDeclInstantiator::VisitVarDecl(VarDecl *D) {
Var->setInvalidDecl();
else if (!D->getType()->isDependentType() &&
!D->getInit()->isTypeDependent() &&
!D->getInit()->isValueDependent()) {
!D->getInit()->isValueDependent() &&
!isa<InitListExpr>(D->getInit())) {
// If neither the declaration's type nor its initializer are dependent,
// we don't want to redo all the checking, especially since the
// initializer might have been wrapped by a CXXConstructExpr since we did
// it the first time.
// FIXME: The InitListExpr handling here is a hack!
Var->setInit(SemaRef.Context, Init.takeAs<Expr>());
}
else if (ParenListExpr *PLE = dyn_cast<ParenListExpr>((Expr *)Init.get())) {

13
clang/test/CodeGenCXX/instantiate-init-list.cpp Normal file
View File

@ -0,0 +1,13 @@
// RUN: clang-cc %s -emit-llvm-only -verify
struct F {
void (*x)();
};
void G();
template<class T> class A {
A();
};
template<class T> A<T>::A() {
static F f = { G };
}
A<int> a;