maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[flang] Resolve merge 

Original-commit: flang-compiler/f18@44743f1fa9
Reviewed-on: https://github.com/flang-compiler/f18/pull/553
Tree-same-pre-rewrite: false
This commit is contained in:
peter klausler 2019-07-08 10:44:43 -07:00
parent 626a4cfdfc
commit 7a6dabf974
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flang/lib/evaluate/type.cc
View File

@ -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_);