[flang-commits] [flang] 89ebd35 - Fix flang tests after MLIR changes on the handling of declarative assembly

[Mehdi Amini via flang-commits]

Author: Mehdi Amini
Date: 2021-12-08T04:31:12Z
New Revision: 89ebd35daabee5bd5b6baab7230072316ee252b6

URL: https://github.com/llvm/llvm-project/commit/89ebd35daabee5bd5b6baab7230072316ee252b6
DIFF: https://github.com/llvm/llvm-project/commit/89ebd35daabee5bd5b6baab7230072316ee252b6.diff

LOG: Fix flang tests after MLIR changes on the handling of declarative assembly

Added: 
    

Modified: 
    flang/test/Fir/array-value-copy.fir
    flang/test/Fir/fir-ops.fir

Removed: 
    


################################################################################
diff  --git a/flang/test/Fir/array-value-copy.fir b/flang/test/Fir/array-value-copy.fir
index 3bbac3ad1e957..191b5d96581d4 100644
--- a/flang/test/Fir/array-value-copy.fir
+++ b/flang/test/Fir/array-value-copy.fir
@@ -130,7 +130,7 @@ func @conversion_with_temporary(%arr0 : !fir.ref<!fir.array<10xi32>>) {
 // CHECK:           fir.store %[[LOAD0]] to %[[COOR1]] : !fir.ref<i32>
 // CHECK:         }
 // Free temporary array.
-// CHECK:         fir.freemem %[[TEMP]] : !fir.heap<!fir.array<10xi32>>
+// CHECK:         fir.freemem %[[TEMP]] : <!fir.array<10xi32>>
 
 // -----
 
@@ -211,7 +211,7 @@ func @conversion_with_temporary_multidim(%0: !fir.ref<!fir.array<10x5xi32>>) {
 // CHECK:             %[[LOAD0:.*]] = fir.load %[[COOR0]] : !fir.ref<i32>
 // CHECK:             %[[COOR1:.*]] = fir.array_coor %[[ARR0]](%{{.*}}) %{{.*}}, %{{.*}} : (!fir.ref<!fir.array<10x5xi32>>, !fir.shape<2>, index, index) -> !fir.ref<i32>
 // CHECK:             fir.store %[[LOAD0]] to %[[COOR1]] : !fir.ref<i32>
-// CHECK:         fir.freemem %[[TEMP]] : !fir.heap<!fir.array<10x5xi32>>
+// CHECK:         fir.freemem %[[TEMP]] : <!fir.array<10x5xi32>>
 
 // -----
 
@@ -309,7 +309,7 @@ func private @user_defined_assignment(!fir.ref<f32>, !fir.ref<f32>)
 // CHECK:             fir.store %[[LOAD0]] to %[[COOR1]] : !fir.ref<f32>
 // CHECK:           }
 // Free the temporary array.
-// CHECK:           fir.freemem %[[TEMP]] : !fir.heap<!fir.array<100xf32>>
+// CHECK:           fir.freemem %[[TEMP]] : <!fir.array<100xf32>>
 // CHECK:           return
 // CHECK:         }
 
@@ -424,7 +424,7 @@ func @conversion_with_temporary_boxed_array(%arr0 : !fir.box<!fir.array<10xi32>>
 // CHECK:           fir.store %[[LOAD0]] to %[[COOR1]] : !fir.ref<i32>
 // CHECK:         }
 // Free temporary array.
-// CHECK:         fir.freemem %[[TEMP]] : !fir.heap<!fir.array<10xi32>>
+// CHECK:         fir.freemem %[[TEMP]] : <!fir.array<10xi32>>
 
 // -----
 

diff  --git a/flang/test/Fir/fir-ops.fir b/flang/test/Fir/fir-ops.fir
index 631200f397c7a..4c407c6798413 100644
--- a/flang/test/Fir/fir-ops.fir
+++ b/flang/test/Fir/fir-ops.fir
@@ -121,7 +121,7 @@ func @instructions() {
   %31 = fir.no_reassoc %29 : i64
 
 // CHECK: fir.call @user_i64([[VAL_35]]) : (i64) -> ()
-// CHECK: fir.freemem [[VAL_5]] : !fir.heap<!fir.array<100xf32>>
+// CHECK: fir.freemem [[VAL_5]] : <!fir.array<100xf32>>
 // CHECK: [[VAL_36:%.*]] = fir.call @get_func() : () -> (() -> ())
 // CHECK: fir.call [[VAL_36]]() : () -> ()
 // CHECK: [[VAL_37:%.*]] = fir.address_of(@it1) : !fir.ref<() -> !fir.int<4>>