diff options
| author | Jayant Chowdhary <jchowdhary@google.com> | 2018-01-25 01:44:29 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-25 01:44:29 +0000 |
| commit | 969182a37f6f70c0e92624b7e7b7c5f021e2bb61 (patch) | |
| tree | d3979f7ac81b4a0c53ee8988f774de230506abce | |
| parent | 9414c598fd19928f81b76cf5f60491eb57da1326 (diff) | |
| parent | d0746cc699d75cc290d6c1a2254d74b85ace38e5 (diff) | |
| download | clang-969182a37f6f70c0e92624b7e7b7c5f021e2bb61.tar.gz | |
Merge "Add nullptr check after dyn_cast to CXXRecordDecl in mangleLocalName()." am: 0a0aca98bd am: 3d92309c0d
am: d0746cc699
Change-Id: I7b88ed65c0edf65303fff60c42817f201d3928db
| -rw-r--r-- | lib/AST/ItaniumMangle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/AST/ItaniumMangle.cpp b/lib/AST/ItaniumMangle.cpp index 5a7c45594e..376cf6fdee 100644 --- a/lib/AST/ItaniumMangle.cpp +++ b/lib/AST/ItaniumMangle.cpp @@ -1471,7 +1471,7 @@ void CXXNameMangler::mangleLocalName(const Decl *D, // numbering will be local to the particular argument in which it appears // -- other default arguments do not affect its encoding. const CXXRecordDecl *CXXRD = dyn_cast<CXXRecordDecl>(RD); - if (CXXRD->isLambda()) { + if (CXXRD && CXXRD->isLambda()) { if (const ParmVarDecl *Parm = dyn_cast_or_null<ParmVarDecl>(CXXRD->getLambdaContextDecl())) { if (const FunctionDecl *Func @@ -1484,7 +1484,7 @@ void CXXNameMangler::mangleLocalName(const Decl *D, } } } - + // Mangle the name relative to the closest enclosing function. // equality ok because RD derived from ND above if (D == RD) { |