This revision was automatically updated to reflect the committed changes. Closed by commit rL270086: Check for nullptr argument. (authored by tra).
Changed prior to commit: http://reviews.llvm.org/D20141?vs=56832&id=57825#toc Repository: rL LLVM http://reviews.llvm.org/D20141 Files: cfe/trunk/lib/CodeGen/CodeGenModule.cpp Index: cfe/trunk/lib/CodeGen/CodeGenModule.cpp =================================================================== --- cfe/trunk/lib/CodeGen/CodeGenModule.cpp +++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp @@ -2082,7 +2082,7 @@ // Check that D is not yet in DiagnosedConflictingDefinitions is required // to make sure that we issue an error only once. - if (lookupRepresentativeDecl(MangledName, OtherGD) && + if (D && lookupRepresentativeDecl(MangledName, OtherGD) && (D->getCanonicalDecl() != OtherGD.getCanonicalDecl().getDecl()) && (OtherD = dyn_cast<VarDecl>(OtherGD.getDecl())) && OtherD->hasInit() && @@ -2301,7 +2301,7 @@ unsigned CodeGenModule::GetGlobalVarAddressSpace(const VarDecl *D, unsigned AddrSpace) { - if (LangOpts.CUDA && LangOpts.CUDAIsDevice) { + if (D && LangOpts.CUDA && LangOpts.CUDAIsDevice) { if (D->hasAttr<CUDAConstantAttr>()) AddrSpace = getContext().getTargetAddressSpace(LangAS::cuda_constant); else if (D->hasAttr<CUDASharedAttr>())
Index: cfe/trunk/lib/CodeGen/CodeGenModule.cpp =================================================================== --- cfe/trunk/lib/CodeGen/CodeGenModule.cpp +++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp @@ -2082,7 +2082,7 @@ // Check that D is not yet in DiagnosedConflictingDefinitions is required // to make sure that we issue an error only once. - if (lookupRepresentativeDecl(MangledName, OtherGD) && + if (D && lookupRepresentativeDecl(MangledName, OtherGD) && (D->getCanonicalDecl() != OtherGD.getCanonicalDecl().getDecl()) && (OtherD = dyn_cast<VarDecl>(OtherGD.getDecl())) && OtherD->hasInit() && @@ -2301,7 +2301,7 @@ unsigned CodeGenModule::GetGlobalVarAddressSpace(const VarDecl *D, unsigned AddrSpace) { - if (LangOpts.CUDA && LangOpts.CUDAIsDevice) { + if (D && LangOpts.CUDA && LangOpts.CUDAIsDevice) { if (D->hasAttr<CUDAConstantAttr>()) AddrSpace = getContext().getTargetAddressSpace(LangAS::cuda_constant); else if (D->hasAttr<CUDASharedAttr>())
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits