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

Move module ctor/dtor/unittest lists to IrModule

Browse source
This commit is contained in:
David Nadlinger 2015-06-13 19:32:08 +02:00
parent 4cefa5e8f5
commit 6190382c3b
4 changed files with 48 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

21
gen/functions.cpp
View file

@ -30,6 +30,7 @@
#include "gen/pragma.h"
#include "gen/runtime.h"
#include "gen/tollvm.h"
#include "ir/irmodule.h"
#if LDC_LLVM_VER >= 305
#include "llvm/Linker/Linker.h"
#else
@ -833,19 +834,21 @@ void DtoDefineFunction(FuncDeclaration* fd)
assert(fd->ident != Id::empty);
if (fd->isUnitTestDeclaration()) {
gIR->unitTests.push_back(fd);
getIrModule(gIR->dmodule)->unitTests.push_back(fd);
} else if (fd->isSharedStaticCtorDeclaration()) {
gIR->sharedCtors.push_back(fd);
getIrModule(gIR->dmodule)->sharedCtors.push_back(fd);
} else if (StaticDtorDeclaration *dtorDecl = fd->isSharedStaticDtorDeclaration()) {
gIR->sharedDtors.push_front(fd);
if (dtorDecl->vgate)
gIR->sharedGates.push_front(dtorDecl->vgate);
getIrModule(gIR->dmodule)->sharedDtors.push_front(fd);
if (dtorDecl->vgate) {
getIrModule(gIR->dmodule)->sharedGates.push_front(dtorDecl->vgate);
}
} else if (fd->isStaticCtorDeclaration()) {
gIR->ctors.push_back(fd);
getIrModule(gIR->dmodule)->ctors.push_back(fd);
} else if (StaticDtorDeclaration *dtorDecl = fd->isStaticDtorDeclaration()) {
gIR->dtors.push_front(fd);
if (dtorDecl->vgate)
gIR->gates.push_front(dtorDecl->vgate);
getIrModule(gIR->dmodule)->dtors.push_front(fd);
if (dtorDecl->vgate) {
getIrModule(gIR->dmodule)->gates.push_front(dtorDecl->vgate);
}
}

11
gen/irstate.h
View file

@ -174,17 +174,6 @@ struct IRState
// debug info helper
ldc::DIBuilder DBuilder;
// static ctors/dtors/unittests
typedef std::list<FuncDeclaration*> FuncDeclList;
typedef std::list<VarDeclaration*> GatesList;
FuncDeclList ctors;
FuncDeclList dtors;
FuncDeclList sharedCtors;
FuncDeclList sharedDtors;
GatesList gates;
GatesList sharedGates;
FuncDeclList unitTests;
// for inline asm
IRAsmBlock* asmBlock;
std::ostringstream nakedAsm;

46
gen/module.cpp
View file

@ -233,52 +233,54 @@ static llvm::Function* build_module_function(const std::string &name, const std:
// build module ctor
llvm::Function* build_module_ctor()
static llvm::Function* build_module_ctor(Module *m)
{
std::string name("_D");
name.append(mangle(gIR->dmodule));
name.append(mangle(m));
name.append("6__ctorZ");
return build_module_function(name, gIR->ctors, gIR->gates);
IrModule *irm = getIrModule(m);
return build_module_function(name, irm->ctors, irm->gates);
}
// build module dtor
static llvm::Function* build_module_dtor()
static llvm::Function* build_module_dtor(Module *m)
{
std::string name("_D");
name.append(mangle(gIR->dmodule));
name.append(mangle(m));
name.append("6__dtorZ");
return build_module_function(name, gIR->dtors);
return build_module_function(name, getIrModule(m)->dtors);
}
// build module unittest
static llvm::Function* build_module_unittest()
static llvm::Function* build_module_unittest(Module *m)
{
std::string name("_D");
name.append(mangle(gIR->dmodule));
name.append(mangle(m));
name.append("10__unittestZ");
return build_module_function(name, gIR->unitTests);
return build_module_function(name, getIrModule(m)->unitTests);
}
// build module shared ctor
llvm::Function* build_module_shared_ctor()
static llvm::Function* build_module_shared_ctor(Module *m)
{
std::string name("_D");
name.append(mangle(gIR->dmodule));
name.append(mangle(m));
name.append("13__shared_ctorZ");
return build_module_function(name, gIR->sharedCtors, gIR->sharedGates);
IrModule *irm = getIrModule(m);
return build_module_function(name, irm->sharedCtors, irm->sharedGates);
}
// build module shared dtor
static llvm::Function* build_module_shared_dtor()
static llvm::Function* build_module_shared_dtor(Module *m)
{
std::string name("_D");
name.append(mangle(gIR->dmodule));
name.append(mangle(m));
name.append("13__shared_dtorZ");
return build_module_function(name, gIR->sharedDtors);
return build_module_function(name, getIrModule(m)->sharedDtors);
}
// build ModuleReference and register function, to register the module info in the global linked list
@ -649,7 +651,7 @@ static void addCoverageAnalysis(Module* m)
// Set up call to _d_cover_register2
llvm::Function* fn = LLVM_D_GetRuntimeFunction(Loc(), gIR->module, "_d_cover_register2");
LLValue* args[] = {
getIrModule(m)->fileName->getInitializer(),
DtoConstString(m->srcfile->name->toChars()),
d_cover_valid_slice,
d_cover_data_slice,
DtoConstUbyte(global.params.covPercent)
@ -671,7 +673,7 @@ static void addCoverageAnalysis(Module* m)
fd->linkage = LINKd;
IrFunction* irfunc = getIrFunc(fd, true);
irfunc->func = ctor;
gIR->sharedCtors.push_back(fd);
getIrModule(m)->sharedCtors.push_back(fd);
}
IF_LOG Logger::undent();
@ -957,11 +959,11 @@ static void genModuleInfo(Module *m)
#define MIlocalClasses 0x800
#define MInew 0x80000000 // it's the "new" layout
llvm::Function* fsharedctor = build_module_shared_ctor();
llvm::Function* fshareddtor = build_module_shared_dtor();
llvm::Function* funittest = build_module_unittest();
llvm::Function* fctor = build_module_ctor();
llvm::Function* fdtor = build_module_dtor();
llvm::Function* fsharedctor = build_module_shared_ctor(m);
llvm::Function* fshareddtor = build_module_shared_dtor(m);
llvm::Function* funittest = build_module_unittest(m);
llvm::Function* fctor = build_module_ctor(m);
llvm::Function* fdtor = build_module_dtor(m);
unsigned flags = MInew;
if (fctor)

14
ir/irmodule.h
View file

@ -7,8 +7,7 @@
//
//===----------------------------------------------------------------------===//
//
// Represents the state of a D module on its way through code generation. Also
// see the TODO in gen/module.cpp – parts of IRState really belong here.
// Represents the state of a D module on its way through code generation.
//
//===----------------------------------------------------------------------===//
@ -27,6 +26,17 @@ struct IrModule
virtual ~IrModule();
Module* M;
// static ctors/dtors/unittests
typedef std::list<FuncDeclaration*> FuncDeclList;
typedef std::list<VarDeclaration*> GatesList;
FuncDeclList ctors;
FuncDeclList dtors;
FuncDeclList sharedCtors;
FuncDeclList sharedDtors;
GatesList gates;
GatesList sharedGates;
FuncDeclList unitTests;
};
IrModule *getIrModule(Module *m);