mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-01 15:40:55 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adapt to free functions in dmd C++ namespace now

Browse source
This commit is contained in:
Martin Kinkelin 2024-03-03 19:14:00 +01:00
parent 217888ff47
commit 9041c0bf67
37 changed files with 132 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ir/irclass.cpp
View file

@ -40,6 +40,8 @@
#include "llvm/Support/raw_ostream.h"
#endif
using namespace dmd;
//////////////////////////////////////////////////////////////////////////////
IrClass::IrClass(ClassDeclaration *cd) : IrAggr(cd) {
@ -217,7 +219,7 @@ LLConstant *IrClass::getVtblInit() {
// it is probably a bug that it still occurs that late.
if (fd->inferRetType() && !fd->type->nextOf()) {
Logger::println("Running late functionSemantic to infer return type.");
if (!fd->functionSemantic()) {
if (!functionSemantic(fd)) {
if (fd->hasSemantic3Errors()) {
Logger::println(
"functionSemantic failed; using null for vtbl entry.");
@ -247,8 +249,8 @@ LLConstant *IrClass::getVtblInit() {
if (fd2->isFuture()) {
continue;
}
if (fd->leastAsSpecialized(fd2, nullptr) != MATCH::nomatch ||
fd2->leastAsSpecialized(fd, nullptr) != MATCH::nomatch) {
if (FuncDeclaration::leastAsSpecialized(fd, fd2, nullptr) != MATCH::nomatch ||
FuncDeclaration::leastAsSpecialized(fd2, fd, nullptr) != MATCH::nomatch) {
TypeFunction *tf = static_cast<TypeFunction *>(fd->type);
if (tf->ty == TY::Tfunction) {
error(cd->loc,
@ -705,7 +707,7 @@ LLConstant *IrClass::getClassInfoInterfaces() {
constants.reserve(cd->vtblInterfaces->length);
LLType *classinfo_type = DtoType(getClassInfoType());
LLType *voidptrptr_type = DtoType(Type::tvoid->pointerTo()->pointerTo());
LLType *voidptrptr_type = DtoType(pointerTo(pointerTo(Type::tvoid)));
LLStructType *interface_type =
isaStruct(DtoType(interfacesArrayType->nextOf()));
assert(interface_type);