diff --git a/flang/lib/Optimizer/Analysis/AliasAnalysis.cpp b/flang/lib/Optimizer/Analysis/AliasAnalysis.cpp index 6ee4f0ff71057a8..969dc748e7c5401 100644 --- a/flang/lib/Optimizer/Analysis/AliasAnalysis.cpp +++ b/flang/lib/Optimizer/Analysis/AliasAnalysis.cpp @@ -257,6 +257,10 @@ AliasAnalysis::Source AliasAnalysis::getSource(mlir::Value v, while (defOp && !breakFromLoop) { ty = defOp->getResultTypes()[0]; llvm::TypeSwitch(defOp) + .Case([&](auto op) { + v = op.getVar(); + defOp = v.getDefiningOp(); + }) .Case([&](auto op) { // Unique memory allocation. type = SourceKind::Allocate; diff --git a/flang/test/Analysis/AliasAnalysis/alias-analysis-9.fir b/flang/test/Analysis/AliasAnalysis/alias-analysis-9.fir new file mode 100644 index 000000000000000..91616a414676f94 --- /dev/null +++ b/flang/test/Analysis/AliasAnalysis/alias-analysis-9.fir @@ -0,0 +1,48 @@ +// Use --mlir-disable-threading so that the AA queries are serialized +// as well as its diagnostic output. +// RUN: fir-opt %s -pass-pipeline='builtin.module(func.func(test-fir-alias-analysis))' -split-input-file --mlir-disable-threading 2>&1 | FileCheck %s + +// Fortran source code: +// program TestTmpArrayAssignment +// integer :: a, b, c +// integer :: arrayD(3) +// +// arrayD = [ a, b, c ] +// end program TestTmpArrayAssignment + +// CHECK-LABEL: Testing : "_QPTestTmpArrayAssignment" +// CHECK-DAG: ArrayD#0 <-> tmp_array#0: NoAlias +func.func @_QPTestTmpArrayAssignment() attributes {fir.bindc_name = "testtmparrayassignment"} { + %0 = fir.alloca i32 {bindc_name = "a", uniq_name = "_QFEa"} + %1:2 = hlfir.declare %0 {uniq_name = "_QFEa"} : (!fir.ref) -> (!fir.ref, !fir.ref) + %c3 = arith.constant 3 : index + %2 = fir.alloca !fir.array<3xi32> {bindc_name = "arrayd", uniq_name = "_QFEarrayd", test.ptr = "ArrayD" } + %3 = fir.shape %c3 : (index) -> !fir.shape<1> + %4:2 = hlfir.declare %2(%3) {uniq_name = "_QFEarrayd"} : (!fir.ref>, !fir.shape<1>) -> (!fir.ref>, !fir.ref>) + %5 = fir.alloca i32 {bindc_name = "b", uniq_name = "_QFEb"} + %6:2 = hlfir.declare %5 {uniq_name = "_QFEb"} : (!fir.ref) -> (!fir.ref, !fir.ref) + %7 = fir.alloca i32 {bindc_name = "c", uniq_name = "_QFEc"} + %8:2 = hlfir.declare %7 {uniq_name = "_QFEc"} : (!fir.ref) -> (!fir.ref, !fir.ref) + %c3_0 = arith.constant 3 : index + %c1 = arith.constant 1 : index + %c1_1 = arith.constant 1 : index + %9 = fir.allocmem !fir.array<3xi32> {bindc_name = ".tmp.arrayctor", uniq_name = ""} + %10 = fir.shape %c3_0 : (index) -> !fir.shape<1> + %11:2 = hlfir.declare %9(%10) {uniq_name = ".tmp.arrayctor"} : (!fir.heap>, !fir.shape<1>) -> (!fir.heap>, !fir.heap>) + %12 = fir.load %1#0 : !fir.ref + %13 = arith.addi %c1, %c1_1 : index + %14 = hlfir.designate %11#0 (%c1) : (!fir.heap>, index) -> !fir.ref + hlfir.assign %12 to %14 : i32, !fir.ref + %15 = fir.load %6#0 : !fir.ref + %16 = arith.addi %13, %c1_1 : index + %17 = hlfir.designate %11#0 (%13) : (!fir.heap>, index) -> !fir.ref + hlfir.assign %15 to %17 : i32, !fir.ref + %18 = fir.load %8#0 : !fir.ref + %19 = hlfir.designate %11#0 (%16) : (!fir.heap>, index) -> !fir.ref + hlfir.assign %18 to %19 : i32, !fir.ref + %true = arith.constant true + %20 = hlfir.as_expr %11#0 move %true {test.ptr = "tmp_array"}: (!fir.heap>, i1) -> !hlfir.expr<3xi32> + hlfir.assign %20 to %4#0 : !hlfir.expr<3xi32>, !fir.ref> + hlfir.destroy %20 : !hlfir.expr<3xi32> + return +}