diff options
| author | Jayant Chowdhary <jchowdhary@google.com> | 2018-01-25 00:39:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-25 00:39:03 +0000 |
| commit | 0a0aca98bdcb51766a7bbbd071e7dd4ea4ab40cb (patch) | |
| tree | d3979f7ac81b4a0c53ee8988f774de230506abce | |
| parent | 363a210ec57a0dfdcbcfc96161c0ea7b7f82ae2c (diff) | |
| parent | 81d1fb439defba7c40db5a94440df4c04a3e74bc (diff) | |
| download | clang-0a0aca98bdcb51766a7bbbd071e7dd4ea4ab40cb.tar.gz | |
Merge "Add nullptr check after dyn_cast to CXXRecordDecl in mangleLocalName()."android-wear-8.0.0_r1
| -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) { |