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

[flang] Prevent segfault in DynamicType::IsTkCompatibleWith 

Make sure `derived_` is not null before dereferencing it.

This might only happen when there is a previous error. I saw it
compiling a test program where a USEd module was not found.

Original-commit: flang-compiler/f18@2db516556b
Reviewed-on: https://github.com/flang-compiler/f18/pull/550
This commit is contained in:
Tim Keith 2019-07-03 15:47:37 -07:00
parent 8d8a867b83
commit 0386490751
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,7 +171,8 @@ bool DynamicType::IsTkCompatibleWith(const DynamicType &that) const {
return true; return true;
} else if (that.IsUnlimitedPolymorphic()) { } else if (that.IsUnlimitedPolymorphic()) {
return false; return false;
} else if (!IsKindCompatible(*derived_, *that.derived_)) { } else if (!derived_ || !that.derived_ ||
!IsKindCompatible(*derived_, *that.derived_)) {
return false; // kind params don't match return false; // kind params don't match
} else if (!IsPolymorphic()) { } else if (!IsPolymorphic()) {
return derived_->typeSymbol() == that.derived_->typeSymbol(); return derived_->typeSymbol() == that.derived_->typeSymbol();