[llvm-branch-commits] [clang-tools-extra-branch] r258431 - Merging r258356:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Jan 21 14:59:35 2016
New Revision: 258431

URL: http://llvm.org/viewvc/llvm-project?rev=258431&view=rev
Log:
Merging r258356:
------------------------------------------------------------------------
r258356 | aaronballman | 2016-01-20 14:14:10 -0800 (Wed, 20 Jan 2016) | 1 line

Make modernize-use-default tolerant of delayed template parsing; this code was previously causing failed assertions because dyn_cast was being passed a null pointer due to the delay-parsed body.
------------------------------------------------------------------------

Added:
    clang-tools-extra/branches/release_38/test/clang-tidy/modernize-use-default-delayed.cpp
      - copied unchanged from r258356, clang-tools-extra/trunk/test/clang-tidy/modernize-use-default-delayed.cpp
Modified:
    clang-tools-extra/branches/release_38/   (props changed)
    clang-tools-extra/branches/release_38/clang-tidy/modernize/UseDefaultCheck.cpp

Propchange: clang-tools-extra/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 21 14:59:35 2016
@@ -1 +1 @@
-/clang-tools-extra/trunk:258327
+/clang-tools-extra/trunk:258327,258356

Modified: clang-tools-extra/branches/release_38/clang-tidy/modernize/UseDefaultCheck.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/branches/release_38/clang-tidy/modernize/UseDefaultCheck.cpp?rev=258431&r1=258430&r2=258431&view=diff
==============================================================================
--- clang-tools-extra/branches/release_38/clang-tidy/modernize/UseDefaultCheck.cpp (original)
+++ clang-tools-extra/branches/release_38/clang-tidy/modernize/UseDefaultCheck.cpp Thu Jan 21 14:59:35 2016
@@ -272,6 +272,7 @@ void UseDefaultCheck::check(const MatchF
   // that are not user-provided (automatically generated).
   if (SpecialFunctionDecl->isDeleted() ||
       SpecialFunctionDecl->isExplicitlyDefaulted() ||
+      SpecialFunctionDecl->isLateTemplateParsed() ||
       !SpecialFunctionDecl->isUserProvided() || !SpecialFunctionDecl->hasBody())
     return;