This is an archive of the discontinued LLVM Phabricator instance.

Differential D129077

[flang] Avoid segfault when defining op is not a fir::Convert
ClosedPublic

Authored by clementval on Jul 4 2022, 6:36 AM.

Details

Reviewers
jeanPerier
PeteSteinfeld
schweitz
klausler
sscalpone
vdonaldson
Commits
rGd7697c175db9: [flang] Avoid segfault when defining op is not a fir::Convert
Summary

The previous code made the assumption that the defining
operation is a fir::ConvertOp without checking. This results in
segmentation fault in code like the added test.

Diff Detail

Event Timeline

clementval created this revision.Jul 4 2022, 6:36 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptJul 4 2022, 6:36 AM
Herald added a subscriber: mehdi_amini. · View Herald Transcript
clementval requested review of this revision.Jul 4 2022, 6:36 AM
Herald added a subscriber: jdoerfert. · View Herald TranscriptJul 4 2022, 6:36 AM
jeanPerier accepted this revision.Jul 4 2022, 6:37 AM

LGTM

This revision is now accepted and ready to land.Jul 4 2022, 6:37 AM
Harbormaster completed remote builds in B173551: Diff 442083.Jul 4 2022, 6:59 AM
Closed by commit rGd7697c175db9: [flang] Avoid segfault when defining op is not a fir::Convert (authored by clementval). · Explain WhyJul 4 2022, 7:03 AM
This revision was automatically updated to reflect the committed changes.
clementval added a commit: rGd7697c175db9: [flang] Avoid segfault when defining op is not a fir::Convert.
clementval mentioned this in D129264: [Flang] Use appropriate casting in getExtentFromTriplet to allow nullptr.Jul 7 2022, 1:59 AM

Revision Contents

PathSize
flang/
lib/
Optimizer/
Builder/
5 lines
test/
Lower/
11 lines

Diff 442091

flang/lib/Optimizer/Builder/FIRBuilder.cpp

Show First 20 Lines • Show All 1,228 Lines • ▼ Show 20 Lines
llvm::Optional<std::int64_t> llvm::Optional<std::int64_t>
fir::factory::getExtentFromTriplet(mlir::Value lb, mlir::Value ub, fir::factory::getExtentFromTriplet(mlir::Value lb, mlir::Value ub,
mlir::Value stride) { mlir::Value stride) {
std::function<llvm::Optional<std::int64_t>(mlir::Value)> getConstantValue = std::function<llvm::Optional<std::int64_t>(mlir::Value)> getConstantValue =
[&](mlir::Value value) -> llvm::Optional<std::int64_t> { [&](mlir::Value value) -> llvm::Optional<std::int64_t> {
if (auto valInt = fir::factory::getIntIfConstant(value)) if (auto valInt = fir::factory::getIntIfConstant(value))
return valInt; return valInt;
else if (auto valOp = mlir::dyn_cast<fir::ConvertOp>(value.getDefiningOp())) auto *definingOp = value.getDefiningOp();
if (mlir::isa_and_nonnull<fir::ConvertOp>(definingOp)) {
auto valOp = mlir::dyn_cast<fir::ConvertOp>(definingOp);
return getConstantValue(valOp.getValue()); return getConstantValue(valOp.getValue());
}
return {}; return {};
}; };
if (auto lbInt = getConstantValue(lb)) { if (auto lbInt = getConstantValue(lb)) {
if (auto ubInt = getConstantValue(ub)) { if (auto ubInt = getConstantValue(ub)) {
if (auto strideInt = getConstantValue(stride)) { if (auto strideInt = getConstantValue(stride)) {
if (strideInt.value() != 0) { if (strideInt.value() != 0) {
std::int64_t extent = std::int64_t extent =
1 + (ubInt.value() - lbInt.value()) / strideInt.value(); 1 + (ubInt.value() - lbInt.value()) / strideInt.value();
Show All 22 Lines

flang/test/Lower/extent_triplets.f90

  • This file was added.
! RUN: bbc -emit-fir %s -o - | FileCheck %s
program test_extent_from_triplet
implicit none
integer, parameter:: n = 3
INTEGER a(n), b(n), i
a = (/ 1, 2, 3 /)
b = (/ (sum(a(1:i)), i=1, n) /)
end program
! CHECK: %{{.*}} = fir.embox %{{.*}}(%{{.*}}) [%{{.*}}] : (!fir.ref<!fir.array<3xi32>>, !fir.shape<1>, !fir.slice<1>) -> !fir.box<!fir.array<?xi32>>