replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

AST: support protocol conformances on id/class/interfaces in MS ABI 

Add support for mangling ObjC protocol conformances in MS ABI as if they are
COM interfaces. By diverging from the itanium mangling of `objc_protocol`
prefixed names, this approach allows for a semi-reasonable, albeit of
questionable sanity, undecoration via existing tooling. There is also the
possibility of adding an extension and taking part of the namespace to add the
conformance via the `L` and `Z` "modifiers", but the existing tooling would not
be able to properly undecorated the symbol even though incidentally `undname`
currently produces something legible while wine's implementation is not able to
cope with the extension.

This allows for the disambiguation of overloads where the parameter differs
only in the protocol conformance of the ObjC type, e.g.

```
@protocol P;
void f(std::vector<id>);
void f(std::vector<id<P>>);
```

which clang would previously fail due to the mangling being identical as the
protocol conformance was ignored.

llvm-svn: 323547
This commit is contained in:
Saleem Abdulrasool 2018-01-26 19:08:26 +00:00
parent 456b555ffe
commit f591e36b89
2 changed files with 64 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
clang/lib/AST/MicrosoftMangle.cpp
View File

@ -2450,9 +2450,36 @@ void MicrosoftCXXNameMangler::mangleType(const ObjCInterfaceType *T, Qualifiers,
void MicrosoftCXXNameMangler::mangleType(const ObjCObjectType *T, Qualifiers,
SourceRange Range) {
// We don't allow overloading by different protocol qualification,
// so mangling them isn't necessary.
mangleType(T->getBaseType(), Range, QMM_Drop);
if (T->qual_empty())
return mangleType(T->getBaseType(), Range, QMM_Drop);
ArgBackRefMap OuterArgsContext;
BackRefVec OuterTemplateContext;
TypeBackReferences.swap(OuterArgsContext);
NameBackReferences.swap(OuterTemplateContext);
mangleTagTypeKind(TTK_Struct);
Out << "?$";
if (T->isObjCId())
mangleSourceName("objc_object");
else if (T->isObjCClass())
mangleSourceName("objc_class");
else
mangleSourceName(T->getInterface()->getName());
for (const auto &Q : T->quals()) {
Out << 'Y'; // cointerface
mangleSourceName(Q->getName());
Out << '@';
}
Out << '@';
Out << '@';
TypeBackReferences.swap(OuterArgsContext);
NameBackReferences.swap(OuterTemplateContext);
}
void MicrosoftCXXNameMangler::mangleType(const BlockPointerType *T,

34
clang/test/CodeGenObjCXX/msabi-protocol-conformance.mm Normal file
View File

@ -0,0 +1,34 @@
// RUN: %clang_cc1 -triple thumbv7-windows-msvc -fobjc-runtime=ios-6.0 -o - -emit-llvm %s | FileCheck %s
@protocol P;
@protocol Q;
@class I;
void f(id<P>, id, id<P>, id) {}
// CHECK-LABEL: "\01?f@@YAXPAU?$objc_object@YP@@@@PAUobjc_object@@01@Z"
void f(id, id<P>, id<P>, id) {}
// CHECK-LABEL: "\01?f@@YAXPAUobjc_object@@PAU?$objc_object@YP@@@@10@Z"
void f(id<P>, id<P>) {}
// CHECK-LABEL: "\01?f@@YAXPAU?$objc_object@YP@@@@0@Z"
void f(id<P>) {}
// CHECK-LABEL: "\01?f@@YAXPAU?$objc_object@YP@@@@@Z"
void f(id<P, Q>) {}
// CHECK-LABEL: "\01?f@@YAXPAU?$objc_object@YP@@YQ@@@@@Z"
void f(Class<P>) {}
// CHECK-LABEL: "\01?f@@YAXPAU?$objc_class@YP@@@@@Z"
void f(Class<P, Q>) {}
// CHECK-LABEL: "\01?f@@YAXPAU?$objc_class@YP@@YQ@@@@@Z"
void f(I<P> *) {}
// CHECK-LABEL: "\01?f@@YAXPAU?$I@YP@@@@@Z"
void f(I<P, Q> *) {}
// CHECK-LABEL: "\01?f@@YAXPAU?$I@YP@@YQ@@@@@Z"