[cfe-commits] r129547 - in /cfe/trunk: lib/Parse/ParseCXXInlineMethods.cpp test/Parser/cxx-member-crash.cpp

[Douglas Gregor]

Author: dgregor
Date: Thu Apr 14 18:19:27 2011
New Revision: 129547

URL: http://llvm.org/viewvc/llvm-project?rev=129547&view=rev
Log:
If the declaration of a C++ member function with an inline definition
is so broken that Sema can't form a declaration for it, don't bother
trying to parse the definition later. Fixes <rdar://problem/9221993>.

Added:
    cfe/trunk/test/Parser/cxx-member-crash.cpp   (with props)
Modified:
    cfe/trunk/lib/Parse/ParseCXXInlineMethods.cpp

Modified: cfe/trunk/lib/Parse/ParseCXXInlineMethods.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseCXXInlineMethods.cpp?rev=129547&r1=129546&r2=129547&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseCXXInlineMethods.cpp (original)
+++ cfe/trunk/lib/Parse/ParseCXXInlineMethods.cpp Thu Apr 14 18:19:27 2011
@@ -87,6 +87,14 @@
     }
   }
 
+
+  if (!FnD) {
+    // If semantic analysis could not build a function declaration,
+    // just throw away the late-parsed declaration.
+    delete getCurrentClass().LateParsedDeclarations.back();
+    getCurrentClass().LateParsedDeclarations.pop_back();
+  }
+
   return FnD;
 }
 

Added: cfe/trunk/test/Parser/cxx-member-crash.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/cxx-member-crash.cpp?rev=129547&view=auto
==============================================================================
--- cfe/trunk/test/Parser/cxx-member-crash.cpp (added)
+++ cfe/trunk/test/Parser/cxx-member-crash.cpp Thu Apr 14 18:19:27 2011
@@ -0,0 +1,15 @@
+// RUN: %clang_cc1 -fsyntax-only %s 2>&1|FileCheck %s
+
+// <rdar://problem/9221993>
+
+// We only care to chek whether the compiler crashes; the actual
+// diagnostics are uninteresting.
+// CHECK: 8 errors generated.
+template<class _CharT>     struct char_traits;
+template<typename _CharT, typename _Traits = char_traits<_CharT> >     class basic_ios;
+template<typename _CharT, typename _Traits = char_traits<_CharT> >     class ostreambuf_iterator;
+template<typename _CharT, typename _InIter = istreambuf_iterator<_CharT> >     class num_get;
+template<typename _CharT, typename _Traits>     class basic_ostream : virtual public basic_ios<_CharT, _Traits>     {
+  template<typename _CharT, typename _InIter>     _InIter     num_get<_CharT, _InIter>::     _M_extract_float(_InIter __beg, _InIter __end, ios_base& __io,        ios_base::iostate& __err, string& __xtrc) const     {
+    const bool __plus = __c == __lit[__num_base::_S_iplus];
+    if ((__plus || __c == __lit[__num_base::_S_iminus])        && !(__lc->_M_use_grouping && __c == __lc->_M_thousands_sep)        && !(__c == __lc->_M_decimal_point))      {

Propchange: cfe/trunk/test/Parser/cxx-member-crash.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cfe/trunk/test/Parser/cxx-member-crash.cpp
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cfe/trunk/test/Parser/cxx-member-crash.cpp
------------------------------------------------------------------------------
    svn:mime-type = text/plain