This revision was automatically updated to reflect the committed changes. Closed by commit rL257461: Fix infinite recursion for invalid declaration, by Dmitry Polukhin (authored by ABataev).
Changed prior to commit: http://reviews.llvm.org/D16065?vs=44499&id=44608#toc Repository: rL LLVM http://reviews.llvm.org/D16065 Files: cfe/trunk/lib/AST/Decl.cpp cfe/trunk/test/SemaCXX/linkage-invalid-decl.cpp Index: cfe/trunk/test/SemaCXX/linkage-invalid-decl.cpp =================================================================== --- cfe/trunk/test/SemaCXX/linkage-invalid-decl.cpp +++ cfe/trunk/test/SemaCXX/linkage-invalid-decl.cpp @@ -0,0 +1,9 @@ +// RUN: %clang_cc1 -fsyntax-only -verify %s + +// This invalid declaration used to call infinite recursion in linkage +// calculation for enum as a function argument. +inline foo(A)(enum E; +// expected-error@-1 {{unknown type name 'foo'}} +// expected-error@-2 {{ISO C++ forbids forward references to 'enum' types}} +// expected-error@-3 {{expected ')'}} +// expected-note@-4 {{to match this '('}} Index: cfe/trunk/lib/AST/Decl.cpp =================================================================== --- cfe/trunk/lib/AST/Decl.cpp +++ cfe/trunk/lib/AST/Decl.cpp @@ -1184,7 +1184,7 @@ return LinkageInfo::none(); const Decl *OuterD = getOutermostFuncOrBlockContext(D); - if (!OuterD) + if (!OuterD || OuterD->isInvalidDecl()) return LinkageInfo::none(); LinkageInfo LV;
Index: cfe/trunk/test/SemaCXX/linkage-invalid-decl.cpp =================================================================== --- cfe/trunk/test/SemaCXX/linkage-invalid-decl.cpp +++ cfe/trunk/test/SemaCXX/linkage-invalid-decl.cpp @@ -0,0 +1,9 @@ +// RUN: %clang_cc1 -fsyntax-only -verify %s + +// This invalid declaration used to call infinite recursion in linkage +// calculation for enum as a function argument. +inline foo(A)(enum E; +// expected-error@-1 {{unknown type name 'foo'}} +// expected-error@-2 {{ISO C++ forbids forward references to 'enum' types}} +// expected-error@-3 {{expected ')'}} +// expected-note@-4 {{to match this '('}} Index: cfe/trunk/lib/AST/Decl.cpp =================================================================== --- cfe/trunk/lib/AST/Decl.cpp +++ cfe/trunk/lib/AST/Decl.cpp @@ -1184,7 +1184,7 @@ return LinkageInfo::none(); const Decl *OuterD = getOutermostFuncOrBlockContext(D); - if (!OuterD) + if (!OuterD || OuterD->isInvalidDecl()) return LinkageInfo::none(); LinkageInfo LV;
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits