[llvm-branch-commits] [lldb] r270105 - Added code that was commented out during testing to stops template member functions from being added to class definitions (see revision 260308 for details).

[Francis Ricci via llvm-branch-commits]

Author: fjricci
Date: Thu May 19 15:12:51 2016
New Revision: 270105

URL: http://llvm.org/viewvc/llvm-project?rev=270105&view=rev
Log:
Added code that was commented out during testing to stops template member functions from being added to class definitions (see revision 260308 for details).

<rdar://problem/24483905>
<rdar://problem/24508374>

Modified:
    lldb/branches/release_38/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp

Modified: lldb/branches/release_38/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_38/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp?rev=270105&r1=270104&r2=270105&view=diff
==============================================================================
--- lldb/branches/release_38/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp (original)
+++ lldb/branches/release_38/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp Thu May 19 15:12:51 2016
@@ -1191,11 +1191,11 @@ DWARFASTParserClang::ParseTypeFromDWARF
                     // that may or may not include these member functions and this means one class won't match another
                     // class definition and it affects our ability to use a class in the clang expression parser. So
                     // for the greater good, we currently must not allow any template member functions in a class definition.
-//                    if (is_cxx_method && has_template_params)
-//                    {
-//                        ignore_containing_context = true;
-//                        is_cxx_method = false;
-//                    }
+                    if (is_cxx_method && has_template_params)
+                    {
+                        ignore_containing_context = true;
+                        is_cxx_method = false;
+                    }
 
                     // clang_type will get the function prototype clang type after this call
                     clang_type = m_ast.CreateFunctionType (return_clang_type,