OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

d: Remove the d_critsec_size target hook. 

The allocation of mutex objects for synchronized statements has been
moved to the library as of merging druntime 58560d51.  All support code
in the compiler for getting the OS critical section size has been
removed along with it.

Reviewed-on: https://github.com/dlang/dmd/pull/11902
	     https://github.com/dlang/druntime/pull/3248

gcc/ChangeLog:

	* config/aarch64/aarch64-linux.h (GNU_USER_TARGET_D_CRITSEC_SIZE):
	Remove.
	* config/glibc-d.c (glibc_d_critsec_size): Likewise.
	(TARGET_D_CRITSEC_SIZE): Likewise.
	* config/i386/linux-common.h (GNU_USER_TARGET_D_CRITSEC_SIZE):
	Likewise.
	* config/sol2-d.c (solaris_d_critsec_size): Likewise.
	(TARGET_D_CRITSEC_SIZE):  Likewise.
	* doc/tm.texi.in (TARGET_D_CRITSEC_SIZE): Likewise.
	* doc/tm.texi: Regenerate.

gcc/d/ChangeLog:

	* dmd/MERGE: Merge upstream dmd bec5973b0.
	* d-target.cc (Target::critsecsize): Remove.
	* d-target.def: Remove d_critsec_size.

libphobos/ChangeLog:

	* libdruntime/MERGE: Merge upstream druntime 58560d51.
This commit is contained in:
Iain Buclaw 2020-10-23 16:48:25 +02:00
parent e419ede891
commit d249ba878c
14 changed files with 28 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/config/aarch64/aarch64-linux.h
View File

@ -64,8 +64,6 @@
} \
while (0)
#define GNU_USER_TARGET_D_CRITSEC_SIZE 48
#define TARGET_ASM_FILE_END aarch64_file_end_indicate_exec_stack
/* Uninitialized common symbols in non-PIE executables, even with

16
gcc/config/glibc-d.c
View File

@ -42,23 +42,7 @@ glibc_d_os_builtins (void)
#endif
}
/* Implement TARGET_D_CRITSEC_SIZE for Glibc targets. */
static unsigned
glibc_d_critsec_size (void)
{
/* This is the sizeof pthread_mutex_t. */
#ifdef GNU_USER_TARGET_D_CRITSEC_SIZE
return GNU_USER_TARGET_D_CRITSEC_SIZE;
#else
return (POINTER_SIZE == 64) ? 40 : 24;
#endif
}
#undef TARGET_D_OS_VERSIONS
#define TARGET_D_OS_VERSIONS glibc_d_os_builtins
#undef TARGET_D_CRITSEC_SIZE
#define TARGET_D_CRITSEC_SIZE glibc_d_critsec_size
struct gcc_targetdm targetdm = TARGETDM_INITIALIZER;

3
gcc/config/i386/linux-common.h
View File

@ -30,9 +30,6 @@ along with GCC; see the file COPYING3. If not see
#define EXTRA_TARGET_D_OS_VERSIONS() \
ANDROID_TARGET_D_OS_VERSIONS();
#define GNU_USER_TARGET_D_CRITSEC_SIZE \
(TARGET_64BIT ? (POINTER_SIZE == 64 ? 40 : 32) : 24)
#undef CC1_SPEC
#define CC1_SPEC \
LINUX_OR_ANDROID_CC (GNU_USER_TARGET_CC1_SPEC, \

12
gcc/config/sol2-d.c
View File

@ -33,19 +33,7 @@ solaris_d_os_builtins (void)
d_add_builtin_version ("Solaris"); \
}
/* Implement TARGET_D_CRITSEC_SIZE for Solaris targets. */
static unsigned
solaris_d_critsec_size (void)
{
/* This is the sizeof pthread_mutex_t. */
return 24;
}
#undef TARGET_D_OS_VERSIONS
#define TARGET_D_OS_VERSIONS solaris_d_os_builtins
#undef TARGET_D_CRITSEC_SIZE
#define TARGET_D_CRITSEC_SIZE solaris_d_critsec_size
struct gcc_targetdm targetdm = TARGETDM_INITIALIZER;

10
gcc/d/d-target.cc
View File

@ -202,16 +202,6 @@ Target::fieldalign (Type *type)
return align / BITS_PER_UNIT;
}
/* Return size of OS critical section.
Can't use the sizeof () calls directly since cross compiling is supported
and would end up using the host sizes rather than the target sizes. */
unsigned
Target::critsecsize (void)
{
return targetdm.d_critsec_size ();
}
/* Returns a Type for the va_list type of the target. */
Type *

10
gcc/d/d-target.def
View File

@ -46,15 +46,5 @@ relating to the target operating system.",
void, (void),
hook_void_void)
/* The sizeof CRITICAL_SECTION or pthread_mutex_t. */
DEFHOOK
(d_critsec_size,
"Returns the size of the data structure used by the target operating system\n\
for critical sections and monitors. For example, on Microsoft Windows this\n\
would return the @code{sizeof(CRITICAL_SECTION)}, while other platforms that\n\
implement pthreads would return @code{sizeof(pthread_mutex_t)}.",
unsigned, (void),
hook_uint_void_0)
/* Close the 'struct gcc_targetdm' definition. */
HOOK_VECTOR_END (C90_EMPTY_HACK)

2
gcc/d/dmd/MERGE
View File

@ -1,4 +1,4 @@
0fcdaab32c7645820820f6e1474343ccfb7560e5
bec5973b0203c95adbda2a049ccdf3cd3a4378f6
The first line of this file holds the git revision number of the last
merge done from the dlang/dmd repository.

2
gcc/d/dmd/idgen.c
View File

@ -262,7 +262,7 @@ Msgtable msgtable[] =
{ "aaRehash", "_aaRehash" },
{ "monitorenter", "_d_monitorenter" },
{ "monitorexit", "_d_monitorexit" },
{ "criticalenter", "_d_criticalenter" },
{ "criticalenter", "_d_criticalenter2" },
{ "criticalexit", "_d_criticalexit" },
{ "__ArrayEq", NULL },
{ "__ArrayPostblit", NULL },

14
gcc/d/dmd/statementsem.c
View File

@ -3213,14 +3213,15 @@ public:
else
{
/* Generate our own critical section, then rewrite as:
* __gshared byte[CriticalSection.sizeof] critsec;
* _d_criticalenter(critsec.ptr);
* try { body } finally { _d_criticalexit(critsec.ptr); }
* __gshared void* __critsec;
* _d_criticalenter2(&__critsec);
* try { body } finally { _d_criticalexit(__critsec); }
*/
Identifier *id = Identifier::generateId("__critsec");
Type *t = Type::tint8->sarrayOf(target.ptrsize + target.critsecsize());
Type *t = Type::tvoidptr;
VarDeclaration *tmp = new VarDeclaration(ss->loc, t, id, NULL);
tmp->storage_class |= STCtemp | STCgshared | STCstatic;
Expression *tmpExp = new VarExp(ss->loc, tmp);
Statements *cs = new Statements();
cs->push(new ExpStatement(ss->loc, tmp));
@ -3236,15 +3237,14 @@ public:
args->push(new Parameter(0, t->pointerTo(), NULL, NULL));
FuncDeclaration *fdenter = FuncDeclaration::genCfunc(args, Type::tvoid, Id::criticalenter, STCnothrow);
Expression *e = new DotIdExp(ss->loc, new VarExp(ss->loc, tmp), Id::ptr);
Expression *e = new AddrExp(ss->loc, tmpExp);
e = semantic(e, sc);
e = new CallExp(ss->loc, new VarExp(ss->loc, fdenter, false), e);
e->type = Type::tvoid; // do not run semantic on e
cs->push(new ExpStatement(ss->loc, e));
FuncDeclaration *fdexit = FuncDeclaration::genCfunc(args, Type::tvoid, Id::criticalexit, STCnothrow);
e = new DotIdExp(ss->loc, new VarExp(ss->loc, tmp), Id::ptr);
e = semantic(e, sc);
e = semantic(tmpExp, sc);
e = new CallExp(ss->loc, new VarExp(ss->loc, fdexit, false), e);
e->type = Type::tvoid; // do not run semantic on e
Statement *s = new ExpStatement(ss->loc, e);

2
gcc/d/dmd/target.h
View File

@ -28,7 +28,6 @@ struct TargetC
{
unsigned longsize; // size of a C 'long' or 'unsigned long' type
unsigned long_doublesize; // size of a C 'long double'
unsigned criticalSectionSize; // size of os critical section
};
struct TargetCPP
@ -98,7 +97,6 @@ public:
// Type sizes and support.
unsigned alignsize(Type *type);
unsigned fieldalign(Type *type);
unsigned critsecsize();
Type *va_listType(const Loc &loc, Scope *sc); // get type of va_list
int isVectorTypeSupported(int sz, Type *type);
bool isVectorOpSupported(Type *type, TOK op, Type *t2 = NULL);

7
gcc/doc/tm.texi
View File

@ -10817,13 +10817,6 @@ Similarly to @code{TARGET_D_CPU_VERSIONS}, but is used for versions
relating to the target operating system.
@end deftypefn
@deftypefn {D Target Hook} unsigned TARGET_D_CRITSEC_SIZE (void)
Returns the size of the data structure used by the target operating system
for critical sections and monitors. For example, on Microsoft Windows this
would return the @code{sizeof(CRITICAL_SECTION)}, while other platforms that
implement pthreads would return @code{sizeof(pthread_mutex_t)}.
@end deftypefn
@node Named Address Spaces
@section Adding support for named address spaces
@cindex named address spaces

2
gcc/doc/tm.texi.in
View File

@ -7351,8 +7351,6 @@ floating-point support; they are not included in this mechanism.
@hook TARGET_D_OS_VERSIONS
@hook TARGET_D_CRITSEC_SIZE
@node Named Address Spaces
@section Adding support for named address spaces
@cindex named address spaces

2
libphobos/libdruntime/MERGE
View File

@ -1,4 +1,4 @@
d05ebaad15fbffce6d707c138c84d7b60fcf5ffd
58560d5163381b0f1c893bd0d035b7a0a1631f92
The first line of this file holds the git revision number of the last
merge done from the dlang/druntime repository.

18
libphobos/libdruntime/rt/critical_.d
View File

@ -31,12 +31,30 @@ extern (C) void _d_critical_term()
extern (C) void _d_criticalenter(D_CRITICAL_SECTION* cs)
{
assert(cs !is null);
ensureMutex(cast(shared(D_CRITICAL_SECTION*)) cs);
lockMutex(&cs.mtx);
}
extern (C) void _d_criticalenter2(D_CRITICAL_SECTION** pcs)
{
if (atomicLoad!(MemoryOrder.acq)(*cast(shared) pcs) is null)
{
lockMutex(cast(Mutex*)&gcs.mtx);
if (atomicLoad!(MemoryOrder.raw)(*cast(shared) pcs) is null)
{
auto cs = new shared D_CRITICAL_SECTION;
initMutex(cast(Mutex*)&cs.mtx);
atomicStore!(MemoryOrder.rel)(*cast(shared) pcs, cs);
}
unlockMutex(cast(Mutex*)&gcs.mtx);
}
lockMutex(&(*pcs).mtx);
}
extern (C) void _d_criticalexit(D_CRITICAL_SECTION* cs)
{
assert(cs !is null);
unlockMutex(&cs.mtx);
}