remove getEffects

Author: SusanTan

flang/include/flang/Optimizer/Dialect/FIROps.td

@@ -80,8 +80,10 @@ def AnyRefOfConstantSizeAggregateType : TypeConstraint<
 // Memory SSA operations
 //===----------------------------------------------------------------------===//
 
-def fir_AllocaOp : fir_Op<"alloca",
-    [AttrSizedOperandSegments, DeclareOpInterfaceMethods<MemoryEffectsOpInterface>]> {
+def fir_AllocaOp
+    : fir_Op<"alloca",
+             [AttrSizedOperandSegments,
+              MemoryEffects<[MemAlloc<AutomaticAllocationScopeResource>]>]> {
   let summary = "allocate storage for a temporary on the stack given a type";
   let description = [{
     This primitive operation is used to allocate an object on the stack.  A
@@ -162,7 +164,9 @@ def fir_AllocaOp : fir_Op<"alloca",
     Variadic<AnyIntegerType>:$shape
   );
 
-  let results = (outs fir_ReferenceType);
+  let results =
+      (outs Res<fir_ReferenceType,
+                "", [MemAlloc<AutomaticAllocationScopeResource>]>:$res);
 
   let hasCustomAssemblyFormat = 1;
   let hasVerifier = 1;
@@ -212,8 +216,9 @@ def fir_AllocaOp : fir_Op<"alloca",
   }];
 }
 
-def fir_AllocMemOp : fir_Op<"allocmem",
-    [DeclareOpInterfaceMethods<MemoryEffectsOpInterface>, AttrSizedOperandSegments]> {
+def fir_AllocMemOp
+    : fir_Op<"allocmem", [AttrSizedOperandSegments,
+                          MemoryEffects<[MemAlloc<DefaultResource>]>]> {
   let summary = "allocate storage on the heap for an object of a given type";
 
   let description = [{
@@ -235,7 +240,7 @@ def fir_AllocMemOp : fir_Op<"allocmem",
     Variadic<AnyIntegerType>:$typeparams,
     Variadic<AnyIntegerType>:$shape
   );
-  let results = (outs fir_HeapType);
+  let results = (outs Res<fir_HeapType, "", [MemAlloc<DefaultResource>]>:$res);
 
   let hasCustomAssemblyFormat = 1;
   let hasVerifier = 1;

flang/lib/Optimizer/Dialect/FIROps.cpp

@@ -285,21 +285,6 @@ llvm::LogicalResult fir::AllocaOp::verify() {
   return mlir::success();
 }
 
-void fir::AllocaOp::getEffects(
-    llvm::SmallVectorImpl<
-        mlir::SideEffects::EffectInstance<mlir::MemoryEffects::Effect>>
-        &effects) {
-  // Value-scoped Allocate for AA.
-  effects.emplace_back(
-      mlir::MemoryEffects::Allocate::get(),
-      mlir::cast<mlir::OpResult>(getOperation()->getResult(0)),
-      mlir::SideEffects::AutomaticAllocationScopeResource::get());
-  // Preserve previous behavior: op-scoped Allocate for passes relying on it.
-  effects.emplace_back(
-      mlir::MemoryEffects::Allocate::get(),
-      mlir::SideEffects::AutomaticAllocationScopeResource::get());
-}
-
 bool fir::AllocaOp::ownsNestedAlloca(mlir::Operation *op) {
   return op->hasTrait<mlir::OpTrait::IsIsolatedFromAbove>() ||
          op->hasTrait<mlir::OpTrait::AutomaticAllocationScope>() ||
@@ -399,19 +384,6 @@ llvm::LogicalResult fir::AllocMemOp::verify() {
   return mlir::success();
 }
 
-void fir::AllocMemOp::getEffects(
-    llvm::SmallVectorImpl<
-        mlir::SideEffects::EffectInstance<mlir::MemoryEffects::Effect>>
-        &effects) {
-  // Value-scoped Allocate for AA.
-  effects.emplace_back(mlir::MemoryEffects::Allocate::get(),
-                       mlir::cast<mlir::OpResult>(getOperation()->getResult(0)),
-                       mlir::SideEffects::DefaultResource::get());
-  // Preserve previous behavior: op-scoped Allocate for passes relying on it.
-  effects.emplace_back(mlir::MemoryEffects::Allocate::get(),
-                       mlir::SideEffects::DefaultResource::get());
-}
-
 //===----------------------------------------------------------------------===//
 // ArrayCoorOp
 //===----------------------------------------------------------------------===//