mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-25 20:50:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

druntime: Add module declaration to rt.invariant, to prevent conflicts with user-provided invariant.d (#21017)

Browse source
This commit is contained in:
Martin Kinkelin 2025-03-18 00:42:46 +01:00 • committed by GitHub
parent fde0f8c40a
commit 6d57da76e4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/src/dmd/backend/drtlsym.d
View file

@ -89,7 +89,7 @@ Symbol* getRtlsym(RTLSYM i) @trusted
case RTLSYM.DARRAYP: symbolz(ps,FL.func,FREGSAVED,"_d_arrayboundsp", SFLexit, t); break;
case RTLSYM.DARRAY_SLICEP: symbolz(ps,FL.func,FREGSAVED,"_d_arraybounds_slicep", SFLexit, t); break;
case RTLSYM.DARRAY_INDEXP: symbolz(ps,FL.func,FREGSAVED,"_d_arraybounds_indexp", SFLexit, t); break;
case RTLSYM.DINVARIANT: symbolz(ps,FL.func,FREGSAVED,"_D9invariant12_d_invariantFC6ObjectZv", 0, tsdlib); break;
case RTLSYM.DINVARIANT: symbolz(ps,FL.func,FREGSAVED,"_D2rt10invariant_12_d_invariantFC6ObjectZv", 0, tsdlib); break;
case RTLSYM.MEMCPY: symbolz(ps,FL.func,FREGSAVED,"memcpy", 0, t); break;
case RTLSYM.MEMSET8: symbolz(ps,FL.func,FREGSAVED,"memset", 0, t); break;
case RTLSYM.MEMSET16: symbolz(ps,FL.func,FREGSAVED,"_memset16", 0, t); break;

2
druntime/Makefile
View file

@ -479,7 +479,7 @@ TESTS_EXTRACTOR=$(ROOT)/tests_extractor$(DOTEXE)
BETTERCTESTS_DIR=$(ROOT)/betterctests
# macro that returns the module name given the src path
moduleName=$(subst rt.invariant,invariant,$(subst object_,object,$(subst /,.,$(1))))
moduleName=$(subst /,.,$(1))
$(ROOT)/unittest/% : $(ROOT)/unittest/test_runner$(DOTEXE)
@mkdir -p $(dir $@)

2
druntime/mak/DOCS
View file

@ -548,7 +548,7 @@ DOCS=\
$(DOCDIR)\rt_deh_win32.html \
$(DOCDIR)\rt_deh_win64_posix.html \
$(DOCDIR)\rt_ehalloc.html \
$(DOCDIR)\rt_invariant.html \
$(DOCDIR)\rt_invariant_.html \
$(DOCDIR)\rt_llmath.html \
$(DOCDIR)\rt_memory.html \
$(DOCDIR)\rt_memset.html \

2
druntime/mak/SRCS
View file

@ -573,7 +573,7 @@ SRCS=\
src\rt\dmain2.d \
src\rt\dwarfeh.d \
src\rt\ehalloc.d \
src\rt\invariant.d \
src\rt\invariant_.d \
src\rt\lifetime.d \
src\rt\llmath.d \
src\rt\memory.d \

9
druntime/src/rt/invariant.d → druntime/src/rt/invariant_.d
View file

@ -4,15 +4,10 @@
* Copyright: Copyright Digital Mars 2007 - 2010.
* License: $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0).
* Authors: Walter Bright
* Source: $(DRUNTIMESRC rt/_invariant.d)
*/
/* Copyright Digital Mars 2007 - 2010.
* Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE or copy at
* http://www.boost.org/LICENSE_1_0.txt)
* Source: $(DRUNTIMESRC rt/_invariant_.d)
*/
module rt.invariant_;
/**
*