From 2a631ae0b07b41cedbf1e9bba4bbe6ba2cee2c96 Mon Sep 17 00:00:00 2001
From: Henrik Brodin <90325907+hbrodin@users.noreply.github.com>
Date: Fri, 7 Feb 2025 11:26:02 +0100
Subject: [PATCH] [MLIR][Interfaces] Do not use extraClassDefnition

---
 mlir/include/mlir/Dialect/LLVMIR/LLVMOps.td | 12 ------------
 mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp  |  5 +++++
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/mlir/include/mlir/Dialect/LLVMIR/LLVMOps.td b/mlir/include/mlir/Dialect/LLVMIR/LLVMOps.td
index fae859f11f9d3..f794e7e1bcca9 100644
--- a/mlir/include/mlir/Dialect/LLVMIR/LLVMOps.td
+++ b/mlir/include/mlir/Dialect/LLVMIR/LLVMOps.td
@@ -782,11 +782,6 @@ def LLVM_CallOp : LLVM_MemAccessOpBase<"call",
     /// Returns the callee function type.
     LLVMFunctionType getCalleeFunctionType();
   }];
-  let extraClassDefinition = [{
-    std::optional<::mlir::StringRef> $cppClass::getUserSymbol() {
-      return getCallee();
-    }
-  }];
 }
 
 //===----------------------------------------------------------------------===//
@@ -1226,13 +1221,6 @@ def LLVM_AddressOfOp : LLVM_Op<"mlir.addressof",
     LLVMFuncOp getFunction(SymbolTableCollection &symbolTable);
 
   }];
-
-  let extraClassDefinition = [{
-    std::optional<::mlir::StringRef> $cppClass::getUserSymbol() {
-      return {getGlobalName()};
-    }
-  }];
-
   let assemblyFormat = "$global_name attr-dict `:` qualified(type($res))";
 
   let hasFolder = 1;
diff --git a/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp b/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
index 4a7237f9cd970..d772351a19c20 100644
--- a/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
+++ b/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
@@ -1307,6 +1307,7 @@ LogicalResult CallOp::verifySymbolUses(SymbolTableCollection &symbolTable) {
 
   return success();
 }
+std::optional<::mlir::StringRef> CallOp::getUserSymbol() { return getCallee(); }
 
 void CallOp::print(OpAsmPrinter &p) {
   auto callee = getCallee();
@@ -2071,6 +2072,10 @@ AddressOfOp::verifySymbolUses(SymbolTableCollection &symbolTable) {
   return success();
 }
 
+std::optional<::mlir::StringRef> AddressOfOp::getUserSymbol() {
+  return getGlobalName();
+}
+
 // AddressOfOp constant-folds to the global symbol name.
 OpFoldResult LLVM::AddressOfOp::fold(FoldAdaptor) {
   return getGlobalNameAttr();