cherry-pick 0bedc28 Clean up and complete CIRGlobalValueInterface methods

Author: xlauko

clang/include/clang/CIR/Dialect/IR/CIROps.td

@@ -517,15 +517,6 @@ def GlobalOp : CIR_Op<"global"> {
   let extraClassDeclaration = [{
     bool isDeclaration() { return !getInitialValue(); }
     bool hasInitializer() { return !isDeclaration(); }
-    bool hasAvailableExternallyLinkage() {
-      return cir::isAvailableExternallyLinkage(getLinkage());
-    }
-    bool hasInternalLinkage() {
-      return cir::isInternalLinkage(getLinkage());
-    }
-    /// Whether the definition of this global may be replaced at link time.
-    bool isWeakForLinker() { return cir::isWeakForLinker(getLinkage()); }
-    bool isDSOLocal() { return getDsolocal(); }
   }];
 
   let skipDefaultBuilders = 1;

clang/include/clang/CIR/Interfaces/CIROpInterfaces.td

@@ -14,14 +14,54 @@
 #define CLANG_CIR_INTERFACES_CIROPINTERFACES_TD
 
 include "mlir/IR/OpBase.td"
+include "mlir/IR/SymbolInterfaces.td"
 
 let cppNamespace = "::cir" in {
-  def CIRGlobalValueInterface : OpInterface<"CIRGlobalValueInterface"> {
+  def CIRGlobalValueInterface
+      : OpInterface<"CIRGlobalValueInterface", [Symbol]> {
 
     let methods =
-        [InterfaceMethod<"", "bool", "hasAvailableExternallyLinkage", (ins),
+        [InterfaceMethod<"", "bool", "hasExternalLinkage", (ins), [{}],
+                         /*defaultImplementation=*/[{
+        return cir::isExternalLinkage($_op.getLinkage());
+      }]>,
+         InterfaceMethod<"", "bool", "hasAvailableExternallyLinkage", (ins),
                          [{}],
-                         /*defaultImplementation=*/[{ return false; }]>,
+                         /*defaultImplementation=*/[{
+        return cir::isAvailableExternallyLinkage($_op.getLinkage());
+      }]>,
+         InterfaceMethod<"", "bool", "hasLinkOnceLinkage", (ins), [{}],
+                         /*defaultImplementation=*/[{
+        return cir::isLinkOnceLinkage($_op.getLinkage());
+      }]>,
+         InterfaceMethod<"", "bool", "hasLinkOnceAnyLinkage", (ins), [{}],
+                         /*defaultImplementation=*/[{
+        return cir::isLinkOnceAnyLinkage($_op.getLinkage());
+      }]>,
+         InterfaceMethod<"", "bool", "hasLinkOnceODRLinkage", (ins), [{}],
+                         /*defaultImplementation=*/[{
+        return cir::isLinkOnceODRLinkage($_op.getLinkage());
+      }]>,
+         InterfaceMethod<"", "bool", "hasWeakLinkage", (ins), [{}],
+                         /*defaultImplementation=*/[{
+        return cir::isWeakLinkage($_op.getLinkage());
+      }]>,
+         InterfaceMethod<"", "bool", "hasWeakAnyLinkage", (ins), [{}],
+                         /*defaultImplementation=*/[{
+        return cir::isWeakAnyLinkage($_op.getLinkage());
+      }]>,
+         InterfaceMethod<"", "bool", "hasWeakODRLinkage", (ins), [{}],
+                         /*defaultImplementation=*/[{
+        return cir::isWeakODRLinkage($_op.getLinkage());
+      }]>,
+         InterfaceMethod<"", "bool", "hasInternalLinkage", (ins), [{}],
+                         /*defaultImplementation=*/[{
+        return cir::isInternalLinkage($_op.getLinkage());
+      }]>,
+         InterfaceMethod<"", "bool", "hasPrivateLinkage", (ins), [{}],
+                         /*defaultImplementation=*/[{
+        return cir::isPrivateLinkage($_op.getLinkage());
+      }]>,
          InterfaceMethod<"", "bool", "hasLocalLinkage", (ins), [{}],
                          /*defaultImplementation=*/[{
         return cir::isLocalLinkage($_op.getLinkage());
@@ -30,9 +70,9 @@ let cppNamespace = "::cir" in {
                          /*defaultImplementation=*/[{
         return cir::isExternalWeakLinkage($_op.getLinkage());
       }]>,
-         InterfaceMethod<"", "bool", "isExternalLinkage", (ins), [{}],
+         InterfaceMethod<"", "bool", "hasCommonLinkage", (ins), [{}],
                          /*defaultImplementation=*/[{
-        return cir::isExternalLinkage($_op.getLinkage());
+        return cir::isCommonLinkage($_op.getLinkage());
       }]>,
          InterfaceMethod<"", "bool", "isDeclarationForLinker", (ins), [{}],
                          /*defaultImplementation=*/[{
@@ -44,10 +84,18 @@ let cppNamespace = "::cir" in {
                          /*defaultImplementation=*/[{
         $_op.setDsolocal(val);
       }]>,
-    ];
+         InterfaceMethod<"", "bool", "isDSOLocal", (ins), [{}],
+                         /*defaultImplementation=*/[{
+        return $_op.getDsolocal();
+      }]>,
+         InterfaceMethod<"", "bool", "isWeakForLinker", (ins), [{}],
+                         /*defaultImplementation=*/[{
+        return cir::isWeakForLinker($_op.getLinkage());
+      }]>];
     let extraClassDeclaration = [{
-    bool canBenefitFromLocalAlias();
-  }];
+      bool hasDefaultVisibility();
+      bool canBenefitFromLocalAlias();
+    }];
   }
 
 } // namespace cir