Simplify logic by using the appropriate functions.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@182869 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/DebugInfo.h b/include/llvm/DebugInfo.h
index 456de34c78494d85842ee4507ec6424991057f67..4de7721511e6dde0af139afa786fdd92ea672318 100644 (file)
--- a/include/llvm/DebugInfo.h
+++ b/include/llvm/DebugInfo.h
@@ -285,7 +285,7 @@ namespace llvm {
       return (getFlags() & FlagStaticMember) != 0;
     }
     bool isValid() const {
-      return DbgNode && (isBasicType() || isDerivedType() || isCompositeType());
+      return DbgNode && isType();
     }
 
     /// isUnsignedDIType - Return true if type encoding is unsigned.

diff --git a/lib/IR/DebugInfo.cpp b/lib/IR/DebugInfo.cpp
index 6a014aee5f32cd8ba6540f8fe9a36aae0293c4ec..68435810edd64d942828f95d91c9b62c795f37c7 100644 (file)
--- a/lib/IR/DebugInfo.cpp
+++ b/lib/IR/DebugInfo.cpp
@@ -351,9 +351,8 @@ bool DIDescriptor::isImportedEntity() const {
 
 DIType::DIType(const MDNode *N) : DIScope(N) {
   if (!N) return;
-  if (!isBasicType() && !isDerivedType() && !isCompositeType()) {
+  if (!isType())
     DbgNode = 0;
-  }
 }
 
 unsigned DIArray::getNumElements() const {