mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-26 13:10:12 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge remote-tracking branch 'upstream/stable' into merge_stable

Browse source
This commit is contained in:
Iain Buclaw 2024-02-16 21:07:20 +00:00
commit 2e1e544ac2
4 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/main.yml vendored
View file

@ -71,6 +71,7 @@ jobs:
model: 32 model: 32
name: ${{ matrix.job_name }} name: ${{ matrix.job_name }}
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.os == 'macos-13' }}
timeout-minutes: 40 timeout-minutes: 40
env: env:
# for ci/run.sh: # for ci/run.sh:

2
VERSION
View file

@ -1 +1 @@
v2.107.0 v2.107.1-rc.1

2
compiler/src/dmd/semantic2.d
View file

@ -876,7 +876,7 @@ private extern(C++) final class StaticAAVisitor : SemanticTimeTransitiveVisitor
hookFunc = new DotIdExp(aaExp.loc, hookFunc, Id.object); hookFunc = new DotIdExp(aaExp.loc, hookFunc, Id.object);
hookFunc = new DotIdExp(aaExp.loc, hookFunc, Id._aaAsStruct); hookFunc = new DotIdExp(aaExp.loc, hookFunc, Id._aaAsStruct);
auto arguments = new Expressions(); auto arguments = new Expressions();
arguments.push(aaExp.syntaxCopy()); arguments.push(aaExp);
Expression loweredExp = new CallExp(aaExp.loc, hookFunc, arguments); Expression loweredExp = new CallExp(aaExp.loc, hookFunc, arguments);
sc = sc.startCTFE(); sc = sc.startCTFE();

17
compiler/test/runnable/staticaa.d
View file

@ -165,6 +165,22 @@ void testEnumInit()
///////////////////////////////////////////// /////////////////////////////////////////////
// https://issues.dlang.org/show_bug.cgi?id=24370
immutable uint[3][string] test = [
"oneTwoThree": [1,2,3],
"fourFiveSix": [4,5,6],
"sevenEightNine": [7,8,9],
];
void testStaticArray()
{
assert(test["oneTwoThree"] == [1, 2, 3]);
assert(test["fourFiveSix"] == [4, 5, 6]);
assert(test["sevenEightNine"] == [7, 8, 9]);
}
/////////////////////////////////////////////
void main() void main()
{ {
testSimple(); testSimple();
@ -175,4 +191,5 @@ void main()
testImmutable(); testImmutable();
testLocalStatic(); testLocalStatic();
testEnumInit(); testEnumInit();
testStaticArray();
} }