[llvm-branch-commits] [cfe-branch] r352118 - Merging r352040:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Jan 24 14:26:09 2019
New Revision: 352118

URL: http://llvm.org/viewvc/llvm-project?rev=352118&view=rev
Log:
Merging r352040:
------------------------------------------------------------------------
r352040 | ibiryukov | 2019-01-24 11:41:43 +0100 (Thu, 24 Jan 2019) | 9 lines

[CodeComplete] [clangd] Fix crash on ValueDecl with a null type

Reviewers: kadircet

Reviewed By: kadircet

Subscribers: ioeric, MaskRay, jkorous, arphaman, cfe-commits

Differential Revision: https://reviews.llvm.org/D57093
------------------------------------------------------------------------

Added:
    cfe/branches/release_80/test/CodeCompletion/crash-null-type.cpp
      - copied unchanged from r352040, cfe/trunk/test/CodeCompletion/crash-null-type.cpp
Modified:
    cfe/branches/release_80/   (props changed)
    cfe/branches/release_80/lib/Sema/SemaCodeComplete.cpp

Propchange: cfe/branches/release_80/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 24 14:26:09 2019
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:351334,351340,351344,351360,351457,351459,351531,351580
+/cfe/trunk:351334,351340,351344,351360,351457,351459,351531,351580,352040
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_80/lib/Sema/SemaCodeComplete.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_80/lib/Sema/SemaCodeComplete.cpp?rev=352118&r1=352117&r2=352118&view=diff
==============================================================================
--- cfe/branches/release_80/lib/Sema/SemaCodeComplete.cpp (original)
+++ cfe/branches/release_80/lib/Sema/SemaCodeComplete.cpp Thu Jan 24 14:26:09 2019
@@ -681,7 +681,8 @@ QualType clang::getDeclUsageType(ASTCont
     T = Property->getType();
   else if (const auto *Value = dyn_cast<ValueDecl>(ND))
     T = Value->getType();
-  else
+
+  if (T.isNull())
     return QualType();
 
   // Dig through references, function pointers, and block pointers to