[all-commits] [llvm/llvm-project] 569716: [flang][hlfir] Fix multiple return declaration type

[Jacob Crawley via All-commits]

  Branch: refs/heads/main
  Home:   https://github.com/llvm/llvm-project
  Commit: 569716fc5c2c232adcd5ff840637be596c1de9b9
      https://github.com/llvm/llvm-project/commit/569716fc5c2c232adcd5ff840637be596c1de9b9
  Author: Tom Eccles <tom.eccles at arm.com>
  Date:   2023-06-19 (Mon, 19 Jun 2023)

  Changed paths:
    M flang/lib/Lower/Bridge.cpp
    A flang/test/Lower/HLFIR/entry_return.f90

  Log Message:
  -----------
  [flang][hlfir] Fix multiple return declaration type

When the ENTRY statement is used, the same source can return different
types depending on the entry point. These different return values are
storage associated (share the same storage). Previously, this led to the
declaration of the results to all have the largest type. This patch adds
a convert between the stack allocation and the declaration so that the
hlfir.decl gets the right type.

I haven't managed to generate code where this convert converted a
reference to an allocation for a smaller type into an allocation for a
larger one, but I have added an assert just in case.

This is a different solution to https://reviews.llvm.org/D152725, see
discussion there.

Differential Revision: https://reviews.llvm.org/D152931


  Commit: f523b9a55a3adecf1a8373ca7525630bdd7fb5ef
      https://github.com/llvm/llvm-project/commit/f523b9a55a3adecf1a8373ca7525630bdd7fb5ef
  Author: Tom Eccles <tom.eccles at arm.com>
  Date:   2023-06-19 (Mon, 19 Jun 2023)

  Changed paths:
    M flang/include/flang/Optimizer/Dialect/FIROps.td
    M flang/lib/Optimizer/Dialect/FIROps.cpp
    M flang/test/Fir/invalid.fir

  Log Message:
  -----------
  [flang] don't allow conversions between logical and floating point

Codegen only supports conversions between logicals and integers. The
verifier should reflect this.

Differential Revision: https://reviews.llvm.org/D152935


  Commit: 3f8d8c1aac3086f603ad73f18fe2bd4fb91fa10a
      https://github.com/llvm/llvm-project/commit/3f8d8c1aac3086f603ad73f18fe2bd4fb91fa10a
  Author: Jacob Crawley <jacob.crawley at arm.com>
  Date:   2023-06-19 (Mon, 19 Jun 2023)

  Changed paths:
    M flang/include/flang/Optimizer/HLFIR/HLFIROps.td
    M flang/lib/Lower/ConvertCall.cpp
    M flang/lib/Optimizer/HLFIR/IR/HLFIROps.cpp
    M flang/lib/Optimizer/HLFIR/Transforms/LowerHLFIRIntrinsics.cpp
    A flang/test/HLFIR/count-lowering.fir
    A flang/test/HLFIR/count.fir
    M flang/test/HLFIR/invalid.fir
    A flang/test/Lower/HLFIR/count.f90

  Log Message:
  -----------
  [flang][hlfir] Add hlfir.count intrinsic

Adds a new HLFIR operation for the COUNT intrinsic according to
the design set out in flang/docs/HighLevel.md. This patch includes all
the necessary changes to create a new HLFIR operation and lower it into
the fir runtime call.

Author was @jacob-crawley. Minor adjustments by @tblah

Differential Revision: https://reviews.llvm.org/D152521


Compare: https://github.com/llvm/llvm-project/compare/6826d3c513b3...3f8d8c1aac30