Mangle global variable names

Author: andykaylor

clang/lib/CIR/CodeGen/CIRGenModule.cpp

@@ -367,8 +367,9 @@ void CIRGenModule::emitGlobalVarDefinition(const clang::VarDecl *vd,
   const QualType astTy = vd->getType();
   const mlir::Type type = convertType(vd->getType());
   if (clang::IdentifierInfo *identifier = vd->getIdentifier()) {
+    StringRef name = getMangledName(GlobalDecl(vd));
     auto varOp = builder.create<cir::GlobalOp>(getLoc(vd->getSourceRange()),
-                                               identifier->getName(), type);
+                                               name, type);
     // TODO(CIR): This code for processing initial values is a placeholder
     // until class ConstantEmitter is upstreamed and the code for processing
     // constant expressions is filled out.  Only the most basic handling of

clang/test/CIR/global-var-linkage.cpp

@@ -4,7 +4,7 @@
 int aaaa;
 // CHECK: cir.global external @aaaa
 static int bbbb;
-// CHECK: cir.global internal @bbbb
+// CHECK: cir.global internal @_ZL4bbbb
 inline int cccc;
 // CHECK: cir.global linkonce_odr @cccc
 [[gnu::selectany]] int dddd;