[flang-commits] [flang] 7a6dabf - [flang] Resolve merge

[peter klausler via flang-commits]

Author: peter klausler
Date: 2019-07-08T10:44:43-07:00
New Revision: 7a6dabf974bdf28a9ed04f3fddaf63709737cba4

URL: https://github.com/llvm/llvm-project/commit/7a6dabf974bdf28a9ed04f3fddaf63709737cba4
DIFF: https://github.com/llvm/llvm-project/commit/7a6dabf974bdf28a9ed04f3fddaf63709737cba4.diff

LOG: [flang] Resolve merge

Original-commit: flang-compiler/f18 at 44743f1fa9377ec6d5929dfe2227295d33ca5673
Reviewed-on: https://github.com/flang-compiler/f18/pull/553
Tree-same-pre-rewrite: false

Added: 
    

Modified: 
    flang/lib/evaluate/type.cc

Removed: 
    


################################################################################
diff  --git a/flang/lib/evaluate/type.cc b/flang/lib/evaluate/type.cc
index f98cdcc65c81..047e3b72f178 100644
--- a/flang/lib/evaluate/type.cc
+++ b/flang/lib/evaluate/type.cc
@@ -174,7 +174,7 @@ bool DynamicType::IsTkCompatibleWith(const DynamicType &that) const {
   } else if (!derived_ || !that.derived_ ||
       !IsKindCompatible(*derived_, *that.derived_)) {
     return false;  // kind params don't match
-  } else if (!IsPolymorphic() && that.derived_ != nullptr) {
+  } else if (!IsPolymorphic()) {
     return derived_->typeSymbol() == that.derived_->typeSymbol();
   } else {
     return IsAncestorTypeOf(derived_, that.derived_);