Skip to content

simplify handling of valtrees for unsized types #114520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 8, 2023

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Aug 5, 2023

No description provided.

@rustbot
Copy link
Collaborator

rustbot commented Aug 5, 2023

r? @TaKO8Ki

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Aug 5, 2023
@rustbot
Copy link
Collaborator

rustbot commented Aug 5, 2023

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

@oli-obk
Copy link
Contributor

oli-obk commented Aug 5, 2023

r? @oli-obk

@rustbot rustbot assigned oli-obk and unassigned TaKO8Ki Aug 5, 2023
@oli-obk
Copy link
Contributor

oli-obk commented Aug 5, 2023

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 5, 2023

📌 Commit 3db638aef498d33b0612eb7f085cbeba8b2f3f22 has been approved by oli-obk

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 5, 2023
@bors
Copy link
Collaborator

bors commented Aug 6, 2023

⌛ Testing commit 3db638aef498d33b0612eb7f085cbeba8b2f3f22 with merge cfb6fcc931b0f5e610a3cb2cc0d2a279b0305bd1...

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Collaborator

bors commented Aug 6, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 6, 2023
@RalfJung
Copy link
Member Author

RalfJung commented Aug 6, 2023

@bors retry apple-alt failure without log

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 6, 2023
@RalfJung
Copy link
Member Author

RalfJung commented Aug 6, 2023

@bors r=oli-obk

@bors
Copy link
Collaborator

bors commented Aug 6, 2023

📌 Commit 997ec63 has been approved by oli-obk

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Aug 8, 2023

⌛ Testing commit 997ec63 with merge 7c21e02eae104a1ca272dcae585ad40a02f985fc...

@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
#11 2.090 gzip: stdin: unexpected end of file
#11 2.090 tar: Unexpected EOF in archive
#11 2.090 tar: Unexpected EOF in archive
#11 2.090 tar: Error is not recoverable: exiting now
#11 ERROR: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
 > [6/8] RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh:

 25  197M   25 50.0M    0     0  28.2M      0  0:00:06  0:00:01  0:00:05 28.2M
2.083 curl: (18) transfer closed with 154836327 bytes remaining to read
---
2.090 tar: Error is not recoverable: exiting now
------
Dockerfile:11
--------------------
   9 |     # GCC 10 changed the default to -fno-common, which causes errors with the NetBSD-9.0 sources like:
  10 |     # /usr/bin/ld: buf.o:(.bss+0x0): multiple definition of `debug_file'; arch.o:(.bss+0x0): first defined here
  11 | >>> RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh
  13 |     COPY scripts/sccache.sh /scripts/
--------------------
--------------------
ERROR: failed to solve: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
#0 building with "default" instance using docker driver

#1 [internal] load .dockerignore
#1 transferring context: 2B done
---
#10 1.868 gzip: stdin: unexpected end of file
#10 1.868 tar: Unexpected EOF in archive
#10 1.868 tar: Unexpected EOF in archive
#10 1.868 tar: Error is not recoverable: exiting now
#10 ERROR: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
 > [6/8] RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh:

 25  197M   25 50.0M    0     0  30.8M      0  0:00:06  0:00:01  0:00:05 30.9M
1.862 curl: (18) transfer closed with 154836327 bytes remaining to read
---
1.868 tar: Error is not recoverable: exiting now
------
Dockerfile:11
--------------------
   9 |     # GCC 10 changed the default to -fno-common, which causes errors with the NetBSD-9.0 sources like:
  10 |     # /usr/bin/ld: buf.o:(.bss+0x0): multiple definition of `debug_file'; arch.o:(.bss+0x0): first defined here
  11 | >>> RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh
  13 |     COPY scripts/sccache.sh /scripts/
--------------------
--------------------
ERROR: failed to solve: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
#0 building with "default" instance using docker driver

#1 [internal] load .dockerignore
#1 transferring context: 2B done
---
#10 1.867 gzip: stdin: unexpected end of file
#10 1.867 tar: Unexpected EOF in archive
#10 1.867 tar: Unexpected EOF in archive
#10 1.868 tar: Error is not recoverable: exiting now
#10 ERROR: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
 > [6/8] RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh:

 22  197M   22 45.3M    0     0  30.4M      0  0:00:06  0:00:01  0:00:05 30.4M
 25  197M   25 50.0M    0     0  31.1M      0  0:00:06  0:00:01  0:00:05 31.0M
---
1.868 tar: Error is not recoverable: exiting now
------
Dockerfile:11
--------------------
   9 |     # GCC 10 changed the default to -fno-common, which causes errors with the NetBSD-9.0 sources like:
  10 |     # /usr/bin/ld: buf.o:(.bss+0x0): multiple definition of `debug_file'; arch.o:(.bss+0x0): first defined here
  11 | >>> RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh
  13 |     COPY scripts/sccache.sh /scripts/
--------------------
--------------------
ERROR: failed to solve: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
#0 building with "default" instance using docker driver

#1 [internal] load .dockerignore
#1 transferring context: 2B done
---
#10 1.684 gzip: stdin: unexpected end of file
#10 1.684 tar: Unexpected EOF in archive
#10 1.684 tar: Unexpected EOF in archive
#10 1.684 tar: Error is not recoverable: exiting now
#10 ERROR: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
 > [6/8] RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh:

 25  197M   25 50.0M    0     0  34.6M      0  0:00:05  0:00:01  0:00:04 34.6M
1.678 curl: (18) transfer closed with 154836327 bytes remaining to read
---
1.684 tar: Error is not recoverable: exiting now
------
Dockerfile:11
--------------------
   9 |     # GCC 10 changed the default to -fno-common, which causes errors with the NetBSD-9.0 sources like:
  10 |     # /usr/bin/ld: buf.o:(.bss+0x0): multiple definition of `debug_file'; arch.o:(.bss+0x0): first defined here
  11 | >>> RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh
  13 |     COPY scripts/sccache.sh /scripts/
--------------------
--------------------
ERROR: failed to solve: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
#0 building with "default" instance using docker driver

#1 [internal] load .dockerignore
#1 transferring context: 2B done
---
#10 1.900 gzip: stdin: unexpected end of file
#10 1.900 tar: Unexpected EOF in archive
#10 1.900 tar: Unexpected EOF in archive
#10 1.900 tar: Error is not recoverable: exiting now
#10 ERROR: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
 > [6/8] RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh:

 25  197M   25 50.0M    0     0  30.4M      0  0:00:06  0:00:01  0:00:05 30.4M
1.893 curl: (18) transfer closed with 154836327 bytes remaining to read
---
1.900 tar: Error is not recoverable: exiting now
------
Dockerfile:11
--------------------
   9 |     # GCC 10 changed the default to -fno-common, which causes errors with the NetBSD-9.0 sources like:
  10 |     # /usr/bin/ld: buf.o:(.bss+0x0): multiple definition of `debug_file'; arch.o:(.bss+0x0): first defined here
  11 | >>> RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh
  13 |     COPY scripts/sccache.sh /scripts/
--------------------
--------------------
ERROR: failed to solve: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
##[error]Process completed with exit code 1.
Post job cleanup.

@bors
Copy link
Collaborator

bors commented Aug 8, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 8, 2023
@RalfJung
Copy link
Member Author

RalfJung commented Aug 8, 2023 via email

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 8, 2023
@bors
Copy link
Collaborator

bors commented Aug 8, 2023

⌛ Testing commit 997ec63 with merge 6d55184...

@bors
Copy link
Collaborator

bors commented Aug 8, 2023

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 6d55184 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 8, 2023
@bors bors merged commit 6d55184 into rust-lang:master Aug 8, 2023
@rustbot rustbot added this to the 1.73.0 milestone Aug 8, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (6d55184): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
0.4% [0.4%, 0.4%] 1
Regressions ❌
(secondary)
0.5% [0.5%, 0.5%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.4% [0.4%, 0.4%] 1

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.1% [-2.1%, -2.1%] 1
All ❌✅ (primary) - - 0

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
2.5% [2.2%, 2.7%] 3
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.6% [-2.6%, -2.6%] 1
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 632.482s -> 634.018s (0.24%)

@RalfJung
Copy link
Member Author

RalfJung commented Aug 8, 2023

So this made rustdoc a bit slower... strange.

@RalfJung RalfJung deleted the unsized-valtrees branch August 8, 2023 15:16
@oli-obk
Copy link
Contributor

oli-obk commented Aug 8, 2023

I think that is noise, the one regression is in typeck, and the other is in the get_auto_trait_impls query.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants