Avoid using DIDescriptor.isNull().
llvm-svn: 97976
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp
index 0f3502e..9b46945 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -98,7 +98,7 @@
// See if this compile unit has been used before for this valid location.
llvm::DICompileUnit &Unit = CompileUnitCache[FID];
- if (!Unit.isNull()) return Unit;
+ if (Unit.Verify()) return Unit;
}
// Get absolute path name.
@@ -698,7 +698,7 @@
/// getOrCreateVTablePtrType - Return debug info descriptor for vtable.
llvm::DIType CGDebugInfo::getOrCreateVTablePtrType(llvm::DICompileUnit Unit) {
- if (!VTablePtrType.isNull())
+ if (VTablePtrType.isValid())
return VTablePtrType;
ASTContext &Context = CGM.getContext();
@@ -1306,8 +1306,8 @@
llvm::DenseMap<const FunctionDecl *, llvm::WeakVH>::iterator
FI = SPCache.find(FD);
if (FI != SPCache.end()) {
- llvm::DISubprogram SP(dyn_cast_or_null<llvm::MDNode>(FI->second));
- if (!SP.isNull() && SP.isSubprogram() && SP.isDefinition()) {
+ llvm::DIDescriptor SP(dyn_cast_or_null<llvm::MDNode>(FI->second));
+ if (SP.isSubprogram() && llvm::DISubprogram(SP.getNode()).isDefinition()) {
RegionStack.push_back(SP.getNode());
RegionMap[D] = llvm::WeakVH(SP.getNode());
return;