diff options
| -rw-r--r-- | include/clang/AST/Decl.h | 2 | ||||
| -rw-r--r-- | test/SemaCXX/return-stack-addr.cpp | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/include/clang/AST/Decl.h b/include/clang/AST/Decl.h index 98b20c1ae1..eb260e3aa8 100644 --- a/include/clang/AST/Decl.h +++ b/include/clang/AST/Decl.h @@ -818,7 +818,7 @@ public: const Expr *getAnyInitializer(const VarDecl *&D) const; bool hasInit() const { - return !Init.isNull(); + return !Init.isNull() && (Init.is<Stmt *>() || Init.is<EvaluatedStmt *>()); } const Expr *getInit() const { if (Init.isNull()) diff --git a/test/SemaCXX/return-stack-addr.cpp b/test/SemaCXX/return-stack-addr.cpp index 7d4cb96402..b4d9b9037d 100644 --- a/test/SemaCXX/return-stack-addr.cpp +++ b/test/SemaCXX/return-stack-addr.cpp @@ -119,5 +119,24 @@ struct PR7999_X {}; PR7999_X& PR7999_f(PR7999<PR7999_X> s) { return s.value; } // no-warning void test_PR7999(PR7999_X& x) { (void)PR7999_f(x); } // no-warning +// PR 8774: Don't try to evaluate parameters with default arguments like +// variables with an initializer, especially in templates where the default +// argument may not be an expression (yet). +namespace PR8774 { + template <typename T> class A { }; + template <typename U> struct B { }; + template <typename V> V f(typename B<V>::type const &v = B<V>::value()) { + return v; + } + template <> struct B<const char *> { + typedef const char *type; + static const char *value(); + }; + void g() { + const char *t; + f<const char*>(t); + } +} + // TODO: test case for dynamic_cast. clang does not yet have // support for C++ classes to write such a test case. |