D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-04-09 13:29:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #412 from AlexeyProkhin/cpp

Browse Source 
extern(C++) interfaces
This commit is contained in:
Kai Nacke
2013-06-30 15:37:10 -07:00
parent 67a9391f79 90bb32d2d8
commit ebadc7fcb3
4 changed files with 72 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gen/toir.cpp
View File

@@ -1496,11 +1496,13 @@ DValue* DotVarExp::toElem(IRState* p)
// If we are calling a non-final interface function, we need to get
// the pointer to the underlying object instead of passing the
// interface pointer directly.
// Unless it is a cpp interface, in that case, we have to match
// C++ behavior and pass the interface pointer.
LLValue* passedThis = 0;
if (e1type->ty == Tclass)
{
TypeClass* tc = static_cast<TypeClass*>(e1type);
if (tc->sym->isInterfaceDeclaration() && nonFinal)
if (tc->sym->isInterfaceDeclaration() && nonFinal && !tc->sym->isCPPinterface())
passedThis = DtoCastInterfaceToObject(l, NULL)->getRVal();
}
LLValue* vthis = l->getRVal();