Author: jeanPerier Date: 2025-01-31T14:51:06+01:00 New Revision: a42f023c8c235b791cdff1366e5e444c735c849f
URL: https://github.com/llvm/llvm-project/commit/a42f023c8c235b791cdff1366e5e444c735c849f DIFF: https://github.com/llvm/llvm-project/commit/a42f023c8c235b791cdff1366e5e444c735c849f.diff LOG: Revert "[flang][hlfir] get rid of box when translating scalars to extented va…" This reverts commit 242aa8c743fe4344844753d8faf59744235319df. Added: Modified: flang/include/flang/Optimizer/Builder/HLFIRTools.h flang/test/HLFIR/assign-codegen.fir Removed: ################################################################################ diff --git a/flang/include/flang/Optimizer/Builder/HLFIRTools.h b/flang/include/flang/Optimizer/Builder/HLFIRTools.h index d8785969bb72471..0684ad0f926ec93 100644 --- a/flang/include/flang/Optimizer/Builder/HLFIRTools.h +++ b/flang/include/flang/Optimizer/Builder/HLFIRTools.h @@ -125,7 +125,7 @@ class Entity : public mlir::Value { bool isSimplyContiguous() const { // If this can be described without a fir.box in FIR, this must // be contiguous. - if (!hlfir::isBoxAddressOrValueType(getFirBase().getType()) || isScalar()) + if (!hlfir::isBoxAddressOrValueType(getFirBase().getType())) return true; // Otherwise, if this entity has a visible declaration in FIR, // or is the dereference of an allocatable or contiguous pointer diff --git a/flang/test/HLFIR/assign-codegen.fir b/flang/test/HLFIR/assign-codegen.fir index 5e48784284a8b4b..581d1ab0e7739c4 100644 --- a/flang/test/HLFIR/assign-codegen.fir +++ b/flang/test/HLFIR/assign-codegen.fir @@ -427,13 +427,3 @@ func.func @test_upoly_expr_assignment(%arg0: !fir.class<!fir.array<?xnone>> {fir // CHECK: } // CHECK: return // CHECK: } - -func.func @test_scalar_box(%arg0: f32, %arg1: !fir.box<!fir.ptr<f32>>) { - hlfir.assign %arg0 to %arg1 : f32, !fir.box<!fir.ptr<f32>> - return -} -// CHECK-LABEL: func.func @test_scalar_box( -// CHECK-SAME: %[[VAL_0:.*]]: f32, -// CHECK-SAME: %[[VAL_1:.*]]: !fir.box<!fir.ptr<f32>>) { -// CHECK: %[[VAL_2:.*]] = fir.box_addr %[[VAL_1]] : (!fir.box<!fir.ptr<f32>>) -> !fir.ptr<f32> -// CHECK: fir.store %[[VAL_0]] to %[[VAL_2]] : !fir.ptr<f32> _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
