D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-25 09:03:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed a segfault in ldc2 when compiling synchronized{} blocks.

Browse Source
This commit is contained in:
Robert Clipsham
2009-09-19 13:05:10 +01:00
parent d6a6b7c797
commit 70b2156010
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
dmd2/statement.c
View File

@@ -30,7 +30,16 @@
#include "attrib.h"
#if IN_LLVM
#include "gen/tollvm.h"
// sizes based on those from tollvm.cpp:DtoMutexType()
int os_critsecsize()
{
if (global.params.os == OSWindows)
return 68;
else if (global.params.os == OSFreeBSD)
return sizeof(size_t);
else
return sizeof(pthread_mutex_t);
}
#elif IN_DMD
extern int os_critsecsize();
#endif
@@ -3869,7 +3878,7 @@ Statement *SynchronizedStatement::semantic(Scope *sc)
#if IN_LLVM
FuncDeclaration *fdexit = FuncDeclaration::genCfunc(args, Type::tvoid, Id::monitorexit);
#else
FuncDeclaration *fdexit = FuncDeclaration::genCfunc(args, Type::tvoid, Id::monitorexit);
FuncDeclaration *fdexit = FuncDeclaration::genCfunc(Type::tvoid, Id::monitorexit);
#endif
e = new CallExp(loc, new VarExp(loc, fdexit), new VarExp(loc, tmp));
e->type = Type::tvoid; // do not run semantic on e
@@ -3889,11 +3898,7 @@ Statement *SynchronizedStatement::semantic(Scope *sc)
* try { body } finally { _d_criticalexit(critsec.ptr); }
*/
Identifier *id = Lexer::uniqueId("__critsec");
#if IN_LLVM
Type *t = new TypeSArray(Type::tint8, new IntegerExp(PTRSIZE + getTypePaddedSize(DtoMutexType())));
#elif IN_DMD
Type *t = new TypeSArray(Type::tint8, new IntegerExp(PTRSIZE + os_critsecsize()));
#endif
VarDeclaration *tmp = new VarDeclaration(loc, t, id, NULL);
tmp->storage_class |= STCgshared | STCstatic;

7
gen/tollvm.cpp
View File

@@ -874,11 +874,8 @@ const LLStructType* DtoMutexType()
opaque->refineAbstractTypeTo(pa.get());
pmutex = isaStruct(pa.get());
if (gIR->module != NULL)
{
gIR->mutexType = pmutex;
gIR->module->addTypeName("D_CRITICAL_SECTION", pmutex);
}
gIR->mutexType = pmutex;
gIR->module->addTypeName("D_CRITICAL_SECTION", pmutex);
return pmutex;
}