- Clean up whitespace.
Hi timurrrr, pcc, cdavis5x,
http://llvm-reviews.chandlerc.com/D1655
CHANGE SINCE LAST DIFF
http://llvm-reviews.chandlerc.com/D1655?vs=4236&id=4239#toc
Files:
lib/AST/MicrosoftMangle.cpp
test/CodeGenCXX/mangle-ms.cpp
Index: lib/AST/MicrosoftMangle.cpp
===================================================================
--- lib/AST/MicrosoftMangle.cpp
+++ lib/AST/MicrosoftMangle.cpp
@@ -29,6 +29,40 @@
namespace {
+/// \brief Retrieve the declaration context that should be used when mangling
+/// the given declaration.
+static const DeclContext *getEffectiveDeclContext(const Decl *D) {
+ // The ABI assumes that lambda closure types that occur within
+ // default arguments live in the context of the function. However, due to
+ // the way in which Clang parses and creates function declarations, this is
+ // not the case: the lambda closure type ends up living in the context
+ // where the function itself resides, because the function declaration itself
+ // had not yet been created. Fix the context here.
+ if (const CXXRecordDecl *RD = dyn_cast<CXXRecordDecl>(D)) {
+ if (RD->isLambda())
+ if (ParmVarDecl *ContextParam =
+ dyn_cast_or_null<ParmVarDecl>(RD->getLambdaContextDecl()))
+ return ContextParam->getDeclContext();
+ }
+
+ // Perform the same check for block literals.
+ if (const BlockDecl *BD = dyn_cast<BlockDecl>(D)) {
+ if (ParmVarDecl *ContextParam =
+ dyn_cast_or_null<ParmVarDecl>(BD->getBlockManglingContextDecl()))
+ return ContextParam->getDeclContext();
+ }
+
+ const DeclContext *DC = D->getDeclContext();
+ if (const CapturedDecl *CD = dyn_cast<CapturedDecl>(DC))
+ return getEffectiveDeclContext(CD);
+
+ return DC;
+}
+
+static const DeclContext *getEffectiveParentContext(const DeclContext *DC) {
+ return getEffectiveDeclContext(cast<Decl>(DC));
+}
+
static const FunctionDecl *getStructor(const FunctionDecl *fn) {
if (const FunctionTemplateDecl *ftd = fn->getPrimaryTemplate())
return ftd->getTemplatedDecl();
@@ -180,17 +214,6 @@
}
-static bool isInCLinkageSpecification(const Decl *D) {
- D = D->getCanonicalDecl();
- for (const DeclContext *DC = D->getDeclContext();
- !DC->isTranslationUnit(); DC = DC->getParent()) {
- if (const LinkageSpecDecl *Linkage = dyn_cast<LinkageSpecDecl>(DC))
- return Linkage->getLanguage() == LinkageSpecDecl::lang_c;
- }
-
- return false;
-}
-
bool MicrosoftMangleContext::shouldMangleDeclName(const NamedDecl *D) {
// In C, functions with no attributes never need to be mangled. Fastpath them.
if (!getASTContext().getLangOpts().CPlusPlus && !D->hasAttrs())
@@ -201,28 +224,46 @@
if (D->hasAttr<AsmLabelAttr>())
return true;
- // Clang's "overloadable" attribute extension to C/C++ implies name mangling
- // (always) as does passing a C++ member function and a function
- // whose name is not a simple identifier.
- const FunctionDecl *FD = dyn_cast<FunctionDecl>(D);
- if (FD && (FD->hasAttr<OverloadableAttr>() || isa<CXXMethodDecl>(FD) ||
- !FD->getDeclName().isIdentifier()))
- return true;
+ if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(D)) {
+ LanguageLinkage L = FD->getLanguageLinkage();
+ // Overloadable functions need mangling.
+ if (FD->hasAttr<OverloadableAttr>())
+ return true;
+
+ // "main" is not mangled.
+ if (FD->isMain())
+ return false;
+
+ // C++ functions and those whose names are not a simple identifier need
+ // mangling.
+ if (!FD->getDeclName().isIdentifier() || L == CXXLanguageLinkage)
+ return true;
+
+ // C functions are not mangled.
+ if (L == CLanguageLinkage)
+ return false;
+ }
// Otherwise, no mangling is done outside C++ mode.
if (!getASTContext().getLangOpts().CPlusPlus)
return false;
- // Variables at global scope with internal linkage are not mangled.
- if (!FD) {
- const DeclContext *DC = D->getDeclContext();
- if (DC->isTranslationUnit() && D->getFormalLinkage() == InternalLinkage)
+ if (const VarDecl *VD = dyn_cast<VarDecl>(D)) {
+ // C variables are not mangled.
+ if (VD->isExternC())
return false;
- }
- // C functions and "main" are not mangled.
- if ((FD && FD->isMain()) || isInCLinkageSpecification(D))
- return false;
+ // Variables at global scope with non-internal linkage are not mangled.
+ const DeclContext *DC = getEffectiveDeclContext(D);
+ // Check for extern variable declared locally.
+ if (DC->isFunctionOrMethod() && D->hasLinkage())
+ while (!DC->isNamespace() && !DC->isTranslationUnit())
+ DC = getEffectiveParentContext(DC);
+
+ if (DC->isTranslationUnit() && D->getFormalLinkage() == InternalLinkage &&
+ !isa<VarTemplateSpecializationDecl>(D))
+ return false;
+ }
return true;
}
@@ -269,10 +310,6 @@
// first, since it is most likely to be the declaration in a header file.
FD = FD->getFirstDeclaration();
- // Don't mangle in the type if this isn't a decl we should typically mangle.
- if (!Context.shouldMangleDeclName(FD))
- return;
-
// We should never ever see a FunctionNoProtoType at this point.
// We don't even know how to mangle their types anyway :).
TypeSourceInfo *TSI = FD->getTypeSourceInfo();
@@ -288,10 +325,16 @@
InStructor = true;
}
- // First, the function class.
- mangleFunctionClass(FD);
+ // extern "C" functions can hold entities that must be mangled.
+ // As it stands, these functions still need to get expressed in the full
+ // external name. They have their class and type omitted, replaced with '9'.
+ if (Context.shouldMangleDeclName(FD)) {
+ // First, the function class.
+ mangleFunctionClass(FD);
- mangleFunctionType(FT, FD, InStructor, InInstMethod);
+ mangleFunctionType(FT, FD, InStructor, InInstMethod);
+ } else
+ Out << '9';
}
void MicrosoftCXXNameMangler::mangleVariableEncoding(const VarDecl *VD) {
Index: test/CodeGenCXX/mangle-ms.cpp
===================================================================
--- test/CodeGenCXX/mangle-ms.cpp
+++ test/CodeGenCXX/mangle-ms.cpp
@@ -1,78 +1,51 @@
// RUN: %clang_cc1 -fblocks -emit-llvm %s -o - -cxx-abi microsoft -triple=i386-pc-win32 | FileCheck %s
// RUN: %clang_cc1 -fblocks -emit-llvm %s -o - -cxx-abi microsoft -triple=x86_64-pc-win32 | FileCheck -check-prefix X64 %s
-// CHECK: @"\01?a@@3HA"
-// CHECK: @"\01?b@N@@3HA"
-// CHECK: @"\01?anonymous@?A@N@@3HA"
-// CHECK: @c
-// CHECK: @"\01?d@foo@@0FB"
-// CHECK: @"\01?e@foo@@1JC"
-// CHECK: @"\01?f@foo@@2DD"
-// CHECK: @"\01?g@bar@@2HA"
-// CHECK: @"\01?h1@@3QAHA"
-// CHECK: @"\01?h2@@3QBHB"
-// CHECK: @"\01?i@@3PAY0BE@HA"
-// CHECK: @"\01?j@@3P6GHCE@ZA"
-// CHECK: @"\01?k@@3PTfoo@@DT1@"
-// X64: @"\01?k@@3PETfoo@@DET1@"
-// CHECK: @"\01?l@@3P8foo@@AEHH@ZQ1@"
-// CHECK: @"\01?color1@@3PANA"
-// CHECK: @"\01?color2@@3QBNB"
-// CHECK: @"\01?color3@@3QAY02$$CBNA"
-// CHECK: @"\01?color4@@3QAY02$$CBNA"
-// X64: @"\01?memptr1@@3RESB@@HES1@"
-// X64: @"\01?memptr2@@3PESB@@HES1@"
-// X64: @"\01?memptr3@@3REQB@@HEQ1@"
-// X64: @"\01?funmemptr1@@3RESB@@R6AHXZES1@"
-// X64: @"\01?funmemptr2@@3PESB@@R6AHXZES1@"
-// X64: @"\01?funmemptr3@@3REQB@@P6AHXZEQ1@"
-// X64: @"\01?memptrtofun1@@3R8B@@EAAXXZEQ1@"
-// X64: @"\01?memptrtofun2@@3P8B@@EAAXXZEQ1@"
-// X64: @"\01?memptrtofun3@@3P8B@@EAAXXZEQ1@"
-// X64: @"\01?memptrtofun4@@3R8B@@EAAHXZEQ1@"
-// X64: @"\01?memptrtofun5@@3P8B@@EAA?CHXZEQ1@"
-// X64: @"\01?memptrtofun6@@3P8B@@EAA?BHXZEQ1@"
-// X64: @"\01?memptrtofun7@@3R8B@@EAAP6AHXZXZEQ1@"
-// X64: @"\01?memptrtofun8@@3P8B@@EAAR6AHXZXZEQ1@"
-// X64: @"\01?memptrtofun9@@3P8B@@EAAQ6AHXZXZEQ1@"
-
int a;
+// CHECK-DAG: @"\01?a@@3HA"
namespace N {
int b;
+// CHECK-DAG: @"\01?b@N@@3HA"
namespace {
int anonymous;
+// CHECK-DAG: @"\01?anonymous@?A@N@@3HA"
}
}
static int c;
+// CHECK-DAG: @c
+
int _c(void) {return N::anonymous + c;}
-// CHECK: @"\01?_c@@YAHXZ"
-// X64: @"\01?_c@@YAHXZ"
+// CHECK-DAG: @"\01?_c@@YAHXZ"
+// X64-DAG: @"\01?_c@@YAHXZ"
class foo {
static const short d;
+// CHECK-DAG: @"\01?d@foo@@0FB"
protected:
static volatile long e;
+// CHECK-DAG: @"\01?e@foo@@1JC"
public:
static const volatile char f;
+// CHECK-DAG: @"\01?f@foo@@2DD"
int operator+(int a);
foo(){}
-//CHECK: @"\01??0foo@@QAE@XZ"
-//X64: @"\01??0foo@@QEAA@XZ"
+// CHECK-DAG: @"\01??0foo@@QAE@XZ"
+// X64-DAG: @"\01??0foo@@QEAA@XZ"
~foo(){}
-//CHECK: @"\01??1foo@@QAE@XZ"
-//X64: @"\01??1foo@@QEAA@XZ
+// CHECK-DAG: @"\01??1foo@@QAE@XZ"
+// X64-DAG: @"\01??1foo@@QEAA@XZ
foo(int i){}
-//CHECK: @"\01??0foo@@QAE@H@Z"
-//X64: @"\01??0foo@@QEAA@H@Z"
+// CHECK-DAG: @"\01??0foo@@QAE@H@Z"
+// X64-DAG: @"\01??0foo@@QEAA@H@Z"
foo(char *q){}
-//CHECK: @"\01??0foo@@QAE@PAD@Z"
-//X64: @"\01??0foo@@QEAA@PEAD@Z"
+// CHECK-DAG: @"\01??0foo@@QAE@PAD@Z"
+// X64-DAG: @"\01??0foo@@QEAA@PEAD@Z"
static foo* static_method() { return 0; }
@@ -97,16 +70,16 @@
};
foo bar() { return foo(); }
-//CHECK: @"\01?bar@@YA?AVfoo@@XZ"
-//X64: @"\01?bar@@YA?AVfoo@@XZ"
+// CHECK-DAG: @"\01?bar@@YA?AVfoo@@XZ"
+// X64-DAG: @"\01?bar@@YA?AVfoo@@XZ"
int foo::operator+(int a) {
-//CHECK: @"\01??Hfoo@@QAEHH@Z"
-//X64: @"\01??Hfoo@@QEAAHH@Z"
+// CHECK-DAG: @"\01??Hfoo@@QAEHH@Z"
+// X64-DAG: @"\01??Hfoo@@QEAAHH@Z"
foo::static_method();
-//CHECK: @"\01?static_method@foo@@SAPAV1@XZ"
-//X64: @"\01?static_method@foo@@SAPEAV1@XZ"
+// CHECK-DAG: @"\01?static_method@foo@@SAPAV1@XZ"
+// X64-DAG: @"\01?static_method@foo@@SAPEAV1@XZ"
bar();
return a;
}
@@ -116,132 +89,169 @@
const volatile char foo::f = 'C';
int bar::g;
+// CHECK-DAG: @"\01?g@bar@@2HA"
extern int * const h1 = &a;
+// CHECK-DAG: @"\01?h1@@3QAHA"
extern const int * const h2 = &a;
+// CHECK-DAG: @"\01?h2@@3QBHB"
int i[10][20];
+// CHECK-DAG: @"\01?i@@3PAY0BE@HA"
int (__stdcall *j)(signed char, unsigned char);
+// CHECK-DAG: @"\01?j@@3P6GHCE@ZA"
const volatile char foo2::*k;
+// CHECK-DAG: @"\01?k@@3PTfoo@@DT1@"
+// X64-DAG: @"\01?k@@3PETfoo@@DET1@"
int (foo2::*l)(int);
+// CHECK-DAG: @"\01?l@@3P8foo@@AEHH@ZQ1@"
// Static functions are mangled, too.
// Also make sure calling conventions, arglists, and throw specs work.
static void __stdcall alpha(float a, double b) throw() {}
bool __fastcall beta(long long a, wchar_t b) throw(signed char, unsigned char) {
-// CHECK: @"\01?beta@@YI_N_J_W@Z"
-// X64: @"\01?beta@@YA_N_J_W@Z"
+// CHECK-DAG: @"\01?beta@@YI_N_J_W@Z"
+// X64-DAG: @"\01?beta@@YA_N_J_W@Z"
alpha(0.f, 0.0);
return false;
}
-// CHECK: @"\01?alpha@@YGXMN@Z"
-// X64: @"\01?alpha@@YAXMN@Z"
+// CHECK-DAG: @"\01?alpha@@YGXMN@Z"
+// X64-DAG: @"\01?alpha@@YAXMN@Z"
// Make sure tag-type mangling works.
void gamma(class foo, struct bar, union baz, enum quux) {}
-// CHECK: @"\01?gamma@@YAXVfoo@@Ubar@@Tbaz@@W4quux@@@Z"
-// X64: @"\01?gamma@@YAXVfoo@@Ubar@@Tbaz@@W4quux@@@Z"
+// CHECK-DAG: @"\01?gamma@@YAXVfoo@@Ubar@@Tbaz@@W4quux@@@Z"
+// X64-DAG: @"\01?gamma@@YAXVfoo@@Ubar@@Tbaz@@W4quux@@@Z"
// Make sure pointer/reference-type mangling works.
void delta(int * const a, const long &) {}
-// CHECK: @"\01?delta@@YAXQAHABJ@Z"
-// X64: @"\01?delta@@YAXQEAHAEBJ@Z"
+// CHECK-DAG: @"\01?delta@@YAXQAHABJ@Z"
+// X64-DAG: @"\01?delta@@YAXQEAHAEBJ@Z"
// Array mangling.
void epsilon(int a[][10][20]) {}
-// CHECK: @"\01?epsilon@@YAXQAY19BE@H@Z"
-// X64: @"\01?epsilon@@YAXQEAY19BE@H@Z"
+// CHECK-DAG: @"\01?epsilon@@YAXQAY19BE@H@Z"
+// X64-DAG: @"\01?epsilon@@YAXQEAY19BE@H@Z"
void zeta(int (*)(int, int)) {}
-// CHECK: @"\01?zeta@@YAXP6AHHH@Z@Z"
-// X64: @"\01?zeta@@YAXP6AHHH@Z@Z"
+// CHECK-DAG: @"\01?zeta@@YAXP6AHHH@Z@Z"
+// X64-DAG: @"\01?zeta@@YAXP6AHHH@Z@Z"
// Blocks mangling (Clang extension). A block should be mangled slightly
// differently from a similar function pointer.
void eta(int (^)(int, int)) {}
-// CHECK: @"\01?eta@@YAXP_EAHHH@Z@Z"
+// CHECK-DAG: @"\01?eta@@YAXP_EAHHH@Z@Z"
typedef int theta_arg(int,int);
void theta(theta_arg^ block) {}
-// CHECK: @"\01?theta@@YAXP_EAHHH@Z@Z"
+// CHECK-DAG: @"\01?theta@@YAXP_EAHHH@Z@Z"
void operator_new_delete() {
char *ptr = new char;
-// CHECK: @"\01??2@YAPAXI@Z"
+// CHECK-DAG: @"\01??2@YAPAXI@Z"
delete ptr;
-// CHECK: @"\01??3@YAXPAX@Z"
+// CHECK-DAG: @"\01??3@YAXPAX@Z"
char *array = new char[42];
-// CHECK: @"\01??_U@YAPAXI@Z"
+// CHECK-DAG: @"\01??_U@YAPAXI@Z"
delete [] array;
-// CHECK: @"\01??_V@YAXPAX@Z"
+// CHECK-DAG: @"\01??_V@YAXPAX@Z"
}
// PR13022
void (redundant_parens)();
void redundant_parens_use() { redundant_parens(); }
-// CHECK: @"\01?redundant_parens@@YAXXZ"
-// X64: @"\01?redundant_parens@@YAXXZ"
+// CHECK-DAG: @"\01?redundant_parens@@YAXXZ"
+// X64-DAG: @"\01?redundant_parens@@YAXXZ"
// PR13047
typedef double RGB[3];
RGB color1;
+// CHECK-DAG: @"\01?color1@@3PANA"
extern const RGB color2 = {};
+// CHECK-DAG: @"\01?color2@@3QBNB"
extern RGB const color3[5] = {};
+// CHECK-DAG: @"\01?color3@@3QAY02$$CBNA"
extern RGB const ((color4)[5]) = {};
+// CHECK-DAG: @"\01?color4@@3QAY02$$CBNA"
struct B;
volatile int B::* volatile memptr1;
+// X64-DAG: @"\01?memptr1@@3RESB@@HES1@"
volatile int B::* memptr2;
+// X64-DAG: @"\01?memptr2@@3PESB@@HES1@"
int B::* volatile memptr3;
+// X64-DAG: @"\01?memptr3@@3REQB@@HEQ1@"
typedef int (*fun)();
volatile fun B::* volatile funmemptr1;
+// X64-DAG: @"\01?funmemptr1@@3RESB@@R6AHXZES1@"
volatile fun B::* funmemptr2;
+// X64-DAG: @"\01?funmemptr2@@3PESB@@R6AHXZES1@"
fun B::* volatile funmemptr3;
+// X64-DAG: @"\01?funmemptr3@@3REQB@@P6AHXZEQ1@"
void (B::* volatile memptrtofun1)();
+// X64-DAG: @"\01?memptrtofun1@@3R8B@@EAAXXZEQ1@"
const void (B::* memptrtofun2)();
+// X64-DAG: @"\01?memptrtofun2@@3P8B@@EAAXXZEQ1@"
volatile void (B::* memptrtofun3)();
+// X64-DAG: @"\01?memptrtofun3@@3P8B@@EAAXXZEQ1@"
int (B::* volatile memptrtofun4)();
+// X64-DAG: @"\01?memptrtofun4@@3R8B@@EAAHXZEQ1@"
volatile int (B::* memptrtofun5)();
+// X64-DAG: @"\01?memptrtofun5@@3P8B@@EAA?CHXZEQ1@"
const int (B::* memptrtofun6)();
+// X64-DAG: @"\01?memptrtofun6@@3P8B@@EAA?BHXZEQ1@"
fun (B::* volatile memptrtofun7)();
+// X64-DAG: @"\01?memptrtofun7@@3R8B@@EAAP6AHXZXZEQ1@"
volatile fun (B::* memptrtofun8)();
+// X64-DAG: @"\01?memptrtofun8@@3P8B@@EAAR6AHXZXZEQ1@"
const fun (B::* memptrtofun9)();
+// X64-DAG: @"\01?memptrtofun9@@3P8B@@EAAQ6AHXZXZEQ1@"
// PR12603
enum E {};
-// CHECK: "\01?fooE@@YA?AW4E@@XZ"
-// X64: "\01?fooE@@YA?AW4E@@XZ"
+// CHECK-DAG: "\01?fooE@@YA?AW4E@@XZ"
+// X64-DAG: "\01?fooE@@YA?AW4E@@XZ"
E fooE() { return E(); }
class X {};
-// CHECK: "\01?fooX@@YA?AVX@@XZ"
-// X64: "\01?fooX@@YA?AVX@@XZ"
+// CHECK-DAG: "\01?fooX@@YA?AVX@@XZ"
+// X64-DAG: "\01?fooX@@YA?AVX@@XZ"
X fooX() { return X(); }
namespace PR13182 {
extern char s0[];
- // CHECK: @"\01?s0@PR13182@@3PADA"
+ // CHECK-DAG: @"\01?s0@PR13182@@3PADA"
extern char s1[42];
- // CHECK: @"\01?s1@PR13182@@3PADA"
+ // CHECK-DAG: @"\01?s1@PR13182@@3PADA"
extern const char s2[];
- // CHECK: @"\01?s2@PR13182@@3QBDB"
+ // CHECK-DAG: @"\01?s2@PR13182@@3QBDB"
extern const char s3[42];
- // CHECK: @"\01?s3@PR13182@@3QBDB"
+ // CHECK-DAG: @"\01?s3@PR13182@@3QBDB"
extern volatile char s4[];
- // CHECK: @"\01?s4@PR13182@@3RCDC"
+ // CHECK-DAG: @"\01?s4@PR13182@@3RCDC"
extern const volatile char s5[];
- // CHECK: @"\01?s5@PR13182@@3SDDD"
+ // CHECK-DAG: @"\01?s5@PR13182@@3SDDD"
extern const char* const* s6;
- // CHECK: @"\01?s6@PR13182@@3PBQBDB"
+ // CHECK-DAG: @"\01?s6@PR13182@@3PBQBDB"
char foo() {
return s0[0] + s1[0] + s2[0] + s3[0] + s4[0] + s5[0] + s6[0][0];
}
}
+
+extern "C" inline void extern_c_func() {
+ static int local;
+// CHECK-DAG: @"\01?local@?1??extern_c_func@@9@4HA"
+// X64-DAG: @"\01?local@?1??extern_c_func@@9@4HA"
+}
+
+void call_extern_c_func() {
+ extern_c_func();
+}
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
