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

wilzbach · 2019-07-27T19:25:19Z

Conflicts:
src/dmd/backend/cgobj.d

…s template parameter

fix issue 19295 - ICE when taking address of member function passed as template parameter

…space to enum

Fix issue 20022: [POSIX] extern(C++, "namespace") does not apply namespace to enum

…o lead to undefined behaviour.

Fix Issue 20025 - alias this combined with a copy constructor seems to lead to undefined behaviour. merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

Fix typo in dmd.func.setUnsafe description

…orary for remove() call

…ackend-typo-strikes-again Fix issue 17885: use the correct expression's type when creating temporary for remove() call merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

fix issue 19708 - Can't use __traits(getAttributes, ...)[...] as a type merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

remove field to match a recent change in mtype.d merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

…f manifest constant structs

fix issue 20011, 17828 - crash or accept write operation on members of manifest constant structs merged-on-behalf-of: Walter Bright <WalterBright@users.noreply.github.com>

Fix bug 20035 - segfault in vcg-ast merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

… not silently corrupt memory in release builds

use same limit on debug record length in debug and release builds merged-on-behalf-of: Walter Bright <WalterBright@users.noreply.github.com>

…erate expressions without types.

Fix issue 20039: when checking for an existing template instance, tolerate expressions without types. merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

a C++ dtor gets its vtblIndex later (and might even be added twice to the vtbl)

fix debug assertion for C++ dtor merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

fix issue 20042 - __vector CTFE crashes the compiler merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

…ate parameter

…instead of (uint).sizeof

fix issue 20045 - bogus error: "integer constant expression expected instead of (uint).sizeof merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

fix issue 20044 - Compiler crash when using an opaque struct as template parameter merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

Fix issue 20052 - SIMD 32 bytes segfault merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

dlang-bot · 2019-07-27T19:25:22Z

Thanks for your pull request, @wilzbach!

Bugzilla references

Auto-close	Bugzilla	Severity	Description
✓	17828	normal	[ICE] Internal error: ddmd/backend/cgcs.c 352 - CTFE appending to an array on a struct from a template
✓	17885	critical	Unable to remove a tuple from associative array.
✓	19295	regression	ICE when taking address of member function passed as template parameter
✓	19708	normal	Can't use __traits(getAttributes, ...)[...] as a type
✓	20011	regression	[REG] modification of member of a manifest constant that's also a struct is allowed
✓	20022	regression	POSIX: extern(C++, `namespace`) does not apply namespace to enum
✓	20025	normal	alias this combined with a copy constructor seems to lead to undefined behaviour.
✓	20035	critical	[ICE] Segmentation fault in ExpressionPrettyPrintVisitor::visit(IntegerExp*) at dmd/hdrgen.d:1775
✓	20039	normal	ICE from double template instantiation with getMember of overload of class and template function
✓	20042	major	__vector CTFE crashes the compiler
✓	20044	critical	Compiler crash when using an opaque struct as template parameter
✓	20045	normal	bogus error: "integer constant expression expected instead of (uint).sizeof"
✓	20052	critical	SIMD 32 bytes causes obscure segfault

Testing this PR locally

If you don't have a local development environment setup, you can use Digger to test this PR:

dub fetch digger
dub run digger -- build "master + dmd#10232"

rainers · 2019-07-27T20:51:10Z

Thanks. This seems to be running into out-of-memory problems, though.

rainers · 2019-07-27T21:36:51Z

This seems to be running into out-of-memory problems, though.

f93ec13 seems to be the offending commit. The introduced silent limit on recursion depth seems problematic to begin with.

rainers · 2019-07-29T07:33:54Z

f93ec13 seems to be the offending commit. The introduced silent limit on recursion depth seems problematic to begin with.

@wilzbach I think I have a fix for that, but it's mostly reverting that commit. What would be the correct workflow: applying the change to stable first, then redo this merge to master PR? Or adding the fix to this PR?

wilzbach · 2019-07-29T07:35:06Z

I think stable first would be better as there might be a point release soon.

reverts most of PR 10205, now fixing the existing recursion check.

[stable] Revert "Fix Issue 19754 - cast() sometimes yields lvalue, sometimes yields rvalue"

redo fix for issue 11856: segfault with circular template constraints merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

rainers · 2019-07-30T06:31:07Z

I think stable first would be better as there might be a point release soon.

Fix is merged, can this be rebased/redone?

wilzbach · 2019-07-30T15:38:55Z

Fix is merged

Awesome. Thanks!

can this be rebased/redone?

Yes, just merged stable in again and rebased against newest master.
Conflicts:
src/dmd/backend/cgobj.d (see #10165)
src/dmd/typesem.d

wilzbach · 2019-07-30T15:41:04Z

src/dmd/backend/cgobj.d

-            naked                           ;
-            mov     EAX,index - [ESP+4]     ;
-            mov     ECX,p - [ESP+4]         ;
-        }


Not sure about this change, but I think I merged this incorrectly. See e.g. #10045

edit: no, it was removed in #10165.

Yeah, looks good.

Conflicts: src/dmd/backend/cgobj.d src/dmd/typesem.d

rainers · 2019-07-30T18:07:13Z

Error on buildkite:

Could not probe the compiler version for "dmd". Toolchain requirements might be ineffective
  | Fetching libdparse 0.10.13 (getting selected version)...
  | Fetching stdx-allocator 2.77.5 (getting selected version)...
  | Invalid SemVer format: 0.00.0
  | posix.mak:616: recipe for target 'generated/linux/release/64/tests_extractor' failed
  | make[1]: *** [generated/linux/release/64/tests_extractor] Error 2
  | make[1]: Leaving directory '/var/lib/buildkite-agent/builds/ci-agent-b008268a-0cc9-4064-908e-0d5803176a33-8/dlang/dmd/phobos'
  | posix.mak:646: recipe for target 'std/array.betterc' failed
  | make: *** [std/array.betterc] Error 2

Could that be caused by #10242?

wilzbach · 2019-07-30T18:19:35Z

Could that be caused by #10242?

Likely, though I wonder why it passed for that result. Let's see whether #10244 helps.

thewilsonator · 2019-08-01T07:49:32Z

Hmm, dlang bot seems to be asleep.

Basile Burg and others added 30 commits July 2, 2019 15:41

fix issue 19295 - ICE when taking address of member function passed a…

5384aee

…s template parameter

Merge pull request dlang#10123 from Basile-z/issue-19295

38a84b5

fix issue 19295 - ICE when taking address of member function passed as template parameter

Fix issue 20022: [POSIX] extern(C++, "namespace") does not apply name…

ba52a8f

…space to enum

Merge pull request dlang#10127 from Geod24/fix-20022

8148f6d

Fix issue 20022: [POSIX] extern(C++, "namespace") does not apply namespace to enum

Fix Issue 20025 - alias this combined with a copy constructor seems t…

dde9964

…o lead to undefined behaviour.

Merge pull request dlang#10137 from RazvanN7/Issue_20025

8c27bbe

Fix Issue 20025 - alias this combined with a copy constructor seems to lead to undefined behaviour. merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

Fix typo in dmd.func.setUnsafe description

45883b8

Merge pull request dlang#10138 from lesderid/fix-setUnsafe-typo

2241982

Fix typo in dmd.func.setUnsafe description

Fix issue 17885: use the correct expression's type when creating temp…

4b8438a

…orary for remove() call

Merge pull request dlang#10140 from FeepingCreature/fix/issue-17885-b…

f811228

…ackend-typo-strikes-again Fix issue 17885: use the correct expression's type when creating temporary for remove() call merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

fix issue 19708 - Can't use __traits(getAttributes, ...)[...] as a type

caf888b

Merge pull request dlang#10144 from Basile-z/issue-19708-alt

aa2d70b

fix issue 19708 - Can't use __traits(getAttributes, ...)[...] as a type merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

remove field to match a recent change in mtype.d

f9858a3

Merge pull request dlang#10145 from Basile-z/fixup-ast-base

c57c887

remove field to match a recent change in mtype.d merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

fix issue 20011, 17828 - crash or accept write operation on members o…

44469ba

…f manifest constant structs

Merge pull request dlang#10115 from Basile-z/issue-20011-17828

f905713

fix issue 20011, 17828 - crash or accept write operation on members of manifest constant structs merged-on-behalf-of: Walter Bright <WalterBright@users.noreply.github.com>

Fix bug 20035 - segfault in vcg-ast (dlang#10155)

e9b518c

Fix bug 20035 - segfault in vcg-ast merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

use same limit on debug record length in debug and release builds, do…

fa3fd10

… not silently corrupt memory in release builds

Merge pull request dlang#10158 from rainers/cv_debug_assert

25ba318

use same limit on debug record length in debug and release builds merged-on-behalf-of: Walter Bright <WalterBright@users.noreply.github.com>

Fix issue 20039: when checking for an existing template instance, tol…

fca2b02

…erate expressions without types.

Merge pull request dlang#10159 from FeepingCreature/fix/issue-20039

00a3035

Fix issue 20039: when checking for an existing template instance, tolerate expressions without types. merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

fix debug assertion for C++ dtor

2646418

a C++ dtor gets its vtblIndex later (and might even be added twice to the vtbl)

Merge pull request dlang#10156 from rainers/cpp_debug_assert

ea6bc80

fix debug assertion for C++ dtor merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

fix issue 20042 - __vector CTFE crashes the compiler (dlang#10160)

02df7b3

fix issue 20042 - __vector CTFE crashes the compiler merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

insidx: fix naked asm in debug builds

905789d

fix issue 20044 - Compiler crash when using an opaque struct as templ…

8ad3f43

…ate parameter

fix issue 20045 - bogus error: "integer constant expression expected …

7bdcec4

…instead of (uint).sizeof

Merge pull request dlang#10174 from Basile-z/issue-20045

4f34502

fix issue 20045 - bogus error: "integer constant expression expected instead of (uint).sizeof merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

Merge pull request dlang#10173 from Basile-z/issue-20044

0d4098b

fix issue 20044 - Compiler crash when using an opaque struct as template parameter merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

Fix issue 20052 - SIMD 32 bytes segfault (dlang#10178)

b561bf5

Fix issue 20052 - SIMD 32 bytes segfault merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

dlang-bot added the Severity:Bug Fix label Jul 27, 2019

wilzbach force-pushed the merge_stable branch from e23f480 to 2a625b5 Compare July 27, 2019 19:28

wilzbach mentioned this pull request Jul 27, 2019

fix building tests with debug compiler #10231

Merged

rainers mentioned this pull request Jul 29, 2019

redo fix for issue 11856: segfault with circular template constraints #10239

Merged

rainers and others added 3 commits July 29, 2019 09:56

redo fix for issue 11856: segfault with circular template constraints

121b29b

reverts most of PR 10205, now fixing the existing recursion check.

Merge pull request dlang#10220 from kinke/revert9505

307684d

[stable] Revert "Fix Issue 19754 - cast() sometimes yields lvalue, sometimes yields rvalue"

Merge pull request dlang#10239 from rainers/refix11856

9cd9501

redo fix for issue 11856: segfault with circular template constraints merged-on-behalf-of: Nicholas Wilson <thewilsonator@users.noreply.github.com>

wilzbach force-pushed the merge_stable branch from cce6435 to d521185 Compare July 30, 2019 15:38

dlang-bot added the Severity:Enhancement label Jul 30, 2019

wilzbach commented Jul 30, 2019

View reviewed changes

wilzbach force-pushed the merge_stable branch from d521185 to beac5e8 Compare July 30, 2019 15:50

wilzbach added 2 commits July 30, 2019 17:55

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

6dcaaf5

Conflicts: src/dmd/backend/cgobj.d src/dmd/typesem.d

Auto-update fail_compilation tests from stable

952f72c

wilzbach force-pushed the merge_stable branch from beac5e8 to 952f72c Compare July 30, 2019 15:57

wilzbach mentioned this pull request Jul 30, 2019

build.d: check result of git describe #10244

Merged

rainers mentioned this pull request Jul 31, 2019

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

Closed

rainers approved these changes Aug 1, 2019

View reviewed changes

rainers added the Merge:auto-merge label Aug 1, 2019

thewilsonator merged commit edc9b35 into dlang:master Aug 1, 2019

wilzbach deleted the merge_stable branch August 1, 2019 11:49

Uh oh!

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

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

Uh oh!

Conversation

wilzbach commented Jul 27, 2019

Uh oh!

dlang-bot commented Jul 27, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Bugzilla references

Testing this PR locally

Uh oh!

rainers commented Jul 27, 2019

Uh oh!

rainers commented Jul 27, 2019

Uh oh!

rainers commented Jul 29, 2019

Uh oh!

wilzbach commented Jul 29, 2019

Uh oh!

rainers commented Jul 30, 2019

Uh oh!

wilzbach commented Jul 30, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wilzbach Jul 30, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rainers Jul 30, 2019

Choose a reason for hiding this comment

Uh oh!

rainers commented Jul 30, 2019

Uh oh!

wilzbach commented Jul 30, 2019

Uh oh!

thewilsonator commented Aug 1, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

dlang-bot commented Jul 27, 2019 •

edited

Loading

wilzbach commented Jul 30, 2019 •

edited

Loading

wilzbach Jul 30, 2019 •

edited

Loading