fix symbol printing on windows

[vtjnash]

Summary

Similar to MCSymbol::print in 3d6c8ebb584375d01b1acead4c2056b3f0c501fc
(llvm-svn: 81682, PR4966), these symbols may need to be quoted to be handled by
the linker correctly.

[compnerd]

LGTM with the name change.

llvm/lib/IR/Mangler.cpp

188

I think that isAcceptableChar is very ambiguous. It can also be difffernent in different contexts. It would be better to rename this to be more precise. Perhaps canBeUnquotedInDirective?

[vtjnash]

rename helper functions to canBeUnquotedInDirective

[vtjnash]

fixing commit diff

llvm/lib/IR/Mangler.cpp

 
 void Mangler::getNameWithPrefix(SmallVectorImpl<char> &OutName,
                                 const GlobalValue *GV,
                                 bool CannotUsePrivateLabel) const {
   raw_svector_ostream OS(OutName);
   getNameWithPrefix(OS, GV, CannotUsePrivateLabel);
 }
 
+// Check if the name needs quotes to be safe for the linker to interpret.
+static bool canBeUnquotedInDirective(char C) {
+  return (C >= 'a' && C <= 'z') || (C >= 'A' && C <= 'Z') ||
+         (C >= '0' && C <= '9') || C == '_' || C == '$' || C == '.' || C == '@';
+}
+
+static bool canBeUnquotedInDirective(StringRef Name) {
+  if (Name.empty())
+    return false;
+
+  // If any of the characters in the string is an unacceptable character, force
+  // quotes.
+  for (char C : Name) {
+    if (!canBeUnquotedInDirective(C))
+      return false;
+  }
+
+  return true;
+}
+
 void llvm::emitLinkerFlagsForGlobalCOFF(raw_ostream &OS, const GlobalValue *GV,
                                         const Triple &TT, Mangler &Mangler) {
   if (!GV->hasDLLExportStorageClass() || GV->isDeclaration())
     return;
 
   if (TT.isWindowsMSVCEnvironment())
     OS << " /EXPORT:";
   else
     OS << " -export:";
 
+  bool NeedQuotes = GV->hasName() && !canBeUnquotedInDirective(GV->getName());
+  if (NeedQuotes)
+    OS << "\"";
   if (TT.isWindowsGNUEnvironment() || TT.isWindowsCygwinEnvironment()) {
     std::string Flag;
     raw_string_ostream FlagOS(Flag);
     Mangler.getNameWithPrefix(FlagOS, GV, false);
     FlagOS.flush();
     if (Flag[0] == GV->getParent()->getDataLayout().getGlobalPrefix())
       OS << Flag.substr(1);
     else
       OS << Flag;
   } else {
     Mangler.getNameWithPrefix(OS, GV, false);
   }
+  if (NeedQuotes)
+    OS << "\"";
 
   if (!GV->getValueType()->isFunctionTy()) {
     if (TT.isWindowsMSVCEnvironment())
       OS << ",DATA";
     else
       OS << ",data";
   }
 }
 
 void llvm::emitLinkerFlagsForUsedCOFF(raw_ostream &OS, const GlobalValue *GV,
                                       const Triple &T, Mangler &M) {
   if (!T.isWindowsMSVCEnvironment())
     return;
 
   OS << " /INCLUDE:";
+  bool NeedQuotes = GV->hasName() && !canBeUnquotedInDirective(GV->getName());
+  if (NeedQuotes)
+    OS << "\"";
   M.getNameWithPrefix(OS, GV, false);
+  if (NeedQuotes)
+    OS << "\"";
 }
 

llvm/test/CodeGen/X86/dllexport.ll

 @Var3 = common dllexport global i32 0, align 4
 
 ; CHECK: .weak _WeakVar1
 @WeakVar1 = weak_odr dllexport global i32 1, align 4
 
 ; CHECK: .weak _WeakVar2
 @WeakVar2 = weak_odr dllexport unnamed_addr constant i32 1
 
+; CHECK: .globl "_complex-name"
+@"complex-name" = dllexport global i32 1, align 4
+
 
 ; Verify items that should not be exported do not appear in the export table.
 ; We use a separate check prefix to avoid confusion between -NOT and -SAME.
 ; NOTEXPORTED: .section .drectve
 ; NOTEXPORTED-NOT: :notExported
 ; NOTEXPORTED-NOT: :notDefined
 
 ; CHECK: .section .drectve
 ; CHECK-CL: .ascii " /EXPORT:_f1"
 ; CHECK-CL: .ascii " /EXPORT:_f2"
 ; CHECK-CL: .ascii " /EXPORT:_stdfun@0"
 ; CHECK-CL: .ascii " /EXPORT:@fastfun@0"
 ; CHECK-CL: .ascii " /EXPORT:_thisfun"
 ; CHECK-CL: .ascii " /EXPORT:_lnk1"
 ; CHECK-CL: .ascii " /EXPORT:_lnk2"
 ; CHECK-CL: .ascii " /EXPORT:_weak1"
 ; CHECK-CL: .ascii " /EXPORT:_Var1,DATA"
 ; CHECK-CL: .ascii " /EXPORT:_Var2,DATA"
 ; CHECK-CL: .ascii " /EXPORT:_Var3,DATA"
 ; CHECK-CL: .ascii " /EXPORT:_WeakVar1,DATA"
 ; CHECK-CL: .ascii " /EXPORT:_WeakVar2,DATA"
+; CHECK-CL: .ascii " /EXPORT:\"_complex-name\",DATA"
 ; CHECK-CL: .ascii " /EXPORT:_alias"
 ; CHECK-CL: .ascii " /EXPORT:_alias2"
 ; CHECK-CL: .ascii " /EXPORT:_alias3"
 ; CHECK-CL: .ascii " /EXPORT:_weak_alias"
 ; CHECK-GCC: .ascii " -export:f1"
 ; CHECK-GCC: .ascii " -export:f2"
 ; CHECK-GCC: .ascii " -export:stdfun@0"
 ; CHECK-GCC: .ascii " -export:@fastfun@0"
 ; CHECK-GCC: .ascii " -export:thisfun"
 ; CHECK-GCC: .ascii " -export:lnk1"
 ; CHECK-GCC: .ascii " -export:lnk2"
 ; CHECK-GCC: .ascii " -export:weak1"
 ; CHECK-GCC: .ascii " -export:Var1,data"
 ; CHECK-GCC: .ascii " -export:Var2,data"
 ; CHECK-GCC: .ascii " -export:Var3,data"
 ; CHECK-GCC: .ascii " -export:WeakVar1,data"
 ; CHECK-GCC: .ascii " -export:WeakVar2,data"
+; CHECK-GCC: .ascii " -export:\"complex-name\",data"
 ; CHECK-GCC: .ascii " -export:alias"
 ; CHECK-GCC: .ascii " -export:alias2"
 ; CHECK-GCC: .ascii " -export:alias3"
 ; CHECK-GCC: .ascii " -export:weak_alias"
 
 ; CHECK: .globl _alias
 ; CHECK: .set _alias, _notExported
 @alias = dllexport alias void(), void()* @notExported