Merge branch 'llvm:main' into staticInit

Author: htyu

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

@@ -175,9 +175,7 @@ def ConstStructAttr : CIR_Attr<"ConstStruct", "const_struct",
   ];
 
   let assemblyFormat = [{
-    `<`
-      custom<ConstStructMembers>($type, $members)
-    `>`
+    `<` custom<StructMembers>($members) `>`
   }];
 
   let genVerifyDecl = 1;
@@ -307,20 +305,20 @@ def TypeInfoAttr : CIR_Attr<"TypeInfo", "typeinfo", [TypedAttrInterface]> {
   }];
 
   let parameters = (ins AttributeSelfTypeParameter<"">:$type,
-                        "ConstStructAttr":$typeinfo_data);
+                        "mlir::ArrayAttr":$data);
 
   let builders = [
     AttrBuilderWithInferredContext<(ins "Type":$type,
-                                        "ConstStructAttr":$typeinfo_data), [{
-      return $_get(type.getContext(), type, typeinfo_data);
+                                        "mlir::ArrayAttr":$data), [{
+      return $_get(type.getContext(), type, data);
     }]>
   ];
 
   // Checks struct element types should match the array for every equivalent
   // element type.
   let genVerifyDecl = 1;
   let assemblyFormat = [{
-    `<` $typeinfo_data `>`
+    `<` custom<StructMembers>($data) `>`
   }];
 }
 

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

@@ -1299,6 +1299,9 @@ def GlobalOp : CIR_Op<"global", [Symbol, DeclareOpInterfaceMethods<RegionBranchO
 
       return isDeclaration();
     }
+
+    /// Whether the definition of this global may be replaced at link time.
+    bool isWeakForLinker() { return cir::isWeakForLinker(getLinkage()); }
   }];
 
   let skipDefaultBuilders = 1;

clang/lib/CIR/CodeGen/CIRGenBuilder.h

@@ -22,11 +22,14 @@
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/BuiltinAttributes.h"
+#include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/Types.h"
 #include "llvm/ADT/APSInt.h"
 #include "llvm/ADT/FloatingPointMode.h"
+#include "llvm/ADT/StringMap.h"
 #include "llvm/Support/ErrorHandling.h"
+#include <string>
 
 namespace cir {
 
@@ -38,6 +41,8 @@ class CIRGenBuilderTy : public mlir::OpBuilder {
   fp::ExceptionBehavior DefaultConstrainedExcept = fp::ebStrict;
   llvm::RoundingMode DefaultConstrainedRounding = llvm::RoundingMode::Dynamic;
 
+  llvm::StringMap<unsigned> GlobalsVersioning;
+
 public:
   CIRGenBuilderTy(mlir::MLIRContext &C, const CIRGenTypeCache &tc)
       : mlir::OpBuilder(&C), typeCache(tc) {}
@@ -144,7 +149,7 @@ class CIRGenBuilderTy : public mlir::OpBuilder {
 
   mlir::cir::TypeInfoAttr getTypeInfo(mlir::ArrayAttr fieldsAttr) {
     auto anonStruct = getAnonConstStruct(fieldsAttr);
-    return mlir::cir::TypeInfoAttr::get(anonStruct.getType(), anonStruct);
+    return mlir::cir::TypeInfoAttr::get(anonStruct.getType(), fieldsAttr);
   }
 
   mlir::TypedAttr getZeroInitAttr(mlir::Type ty) {
@@ -463,6 +468,36 @@ class CIRGenBuilderTy : public mlir::OpBuilder {
     return Address(baseAddr, ptrTy, addr.getAlignment());
   }
 
+  // FIXME(cir): CIRGenBuilder class should have an attribute with a reference
+  // to the module so that we don't have search for it or pass it around.
+  // FIXME(cir): Track a list of globals, or at least the last one inserted, so
+  // that we can insert globals in the same order they are defined by CIRGen.
+
+  /// Creates a versioned global variable. If the symbol is already taken, an ID
+  /// will be appended to the symbol. The returned global must always be queried
+  /// for its name so it can be referenced correctly.
+  [[nodiscard]] mlir::cir::GlobalOp
+  createVersionedGlobal(mlir::ModuleOp module, mlir::Location loc,
+                        mlir::StringRef name, mlir::Type type, bool isConst,
+                        mlir::cir::GlobalLinkageKind linkage) {
+    mlir::OpBuilder::InsertionGuard guard(*this);
+    setInsertionPointToStart(module.getBody());
+
+    // Create a unique name if the given name is already taken.
+    std::string uniqueName;
+    if (unsigned version = GlobalsVersioning[name.str()]++)
+      uniqueName = name.str() + "." + std::to_string(version);
+    else
+      uniqueName = name.str();
+
+    return create<mlir::cir::GlobalOp>(loc, uniqueName, type, isConst, linkage);
+  }
+
+  mlir::Value createGetGlobal(mlir::cir::GlobalOp global) {
+    return create<mlir::cir::GetGlobalOp>(
+        global.getLoc(), getPointerTo(global.getSymType()), global.getName());
+  }
+
   /// Cast the element type of the given address to a different type,
   /// preserving information like the alignment.
   cir::Address createElementBitCast(mlir::Location loc, cir::Address addr,