correctly lower `impl const` to bind to host effect param #114545

fee1-dead · 2023-08-06T13:23:57Z

oli-obk · 2023-08-06T13:49:30Z

compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs

-                        if !infer_args && has_default {
+                        if !infer_args
+                            && has_default
+                            && !tcx.has_attr(param.def_id, sym::rustc_host)


How does this work for desugared params?

desugared params get this attribute as well: link

oli-obk · 2023-08-06T15:41:09Z

r=me with tidy happy

fee1-dead · 2023-08-06T17:02:15Z

r=me with tidy happy

a review of this commit which fixes the ICE would be nice

oli-obk · 2023-08-07T16:28:36Z

compiler/rustc_hir_analysis/src/collect.rs

+                let mut path_segments = ast_trait_ref.path.segments.to_vec();
+                let last_segment = path_segments.len() - 1;
+                let mut args = path_segments[last_segment].args().clone();
+                args.args = &args.args[..args.args.len() - 1];


maybe assert that you are actually removing the host param, and not something else that snuck in

This turns out to be a bit more complicated and I didn't want to look inside bodies, so I just added the attr to all automatically generated bodies and asserted that the attr exists instead.

compiler/rustc_hir_analysis/src/collect.rs

oli-obk · 2023-08-07T18:58:17Z

@bors r+

bors · 2023-08-07T18:58:19Z

📌 Commit 057be38 has been approved by oli-obk

It is now in the queue for this repository.

bors · 2023-08-08T05:06:28Z

⌛ Testing commit 057be38 with merge 6069c503450c448e96bd0ebbd98fcfb5087b3304...

bors · 2023-08-08T05:10:04Z

💔 Test failed - checks-actions

rust-log-analyzer · 2023-08-08T05:16:49Z

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

Click to see the possible cause of the failure (guessed by this bot)

#11 8.895 
#11 8.895 gzip: stdin: unexpected end of file
#11 8.896 tar: Child returned status 1
#11 8.896 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:
0.296 + mkdir netbsd

 97  197M   97  193M    0     0  22.4M      0  0:00:08  0:00:08 --:--:-- 25.2M
---
8.896 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 9.062 
#10 9.062 gzip: stdin: unexpected end of file
#10 9.063 tar: Child returned status 1
#10 9.063 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:
0.268 + mkdir netbsd

 97  197M   97  192M    0     0  21.9M      0  0:00:08  0:00:08 --:--:-- 24.1M
---
9.063 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 9.360 
#10 9.360 gzip: stdin: unexpected end of file
#10 9.361 tar: Child returned status 1
#10 9.361 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:
0.245 + mkdir netbsd

 97  197M   97  192M    0     0  21.1M      0  0:00:09  0:00:09 --:--:-- 24.2M
---
9.361 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 8.558 
#10 8.558 gzip: stdin: unexpected end of file
#10 8.559 tar: Child returned status 1
#10 8.560 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:
0.279 + mkdir netbsd

 97  197M   97  193M    0     0  23.3M      0  0:00:08  0:00:08 --:--:-- 24.7M
---
8.560 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 9.083 
#10 9.083 gzip: stdin: unexpected end of file
#10 9.084 tar: Child returned status 1
#10 9.084 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:
0.276 + mkdir netbsd

 97  197M   97  193M    0     0  21.9M      0  0:00:09  0:00:08  0:00:01 23.2M
---
9.084 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.

fee1-dead · 2023-08-08T05:22:36Z

spurious

@bors retry

bors · 2023-08-08T19:23:44Z

⌛ Testing commit 057be38 with merge f88a8b7...

bors · 2023-08-08T22:00:33Z

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

rust-timer · 2023-08-09T02:15:49Z

Finished benchmarking commit (f88a8b7): 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
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)	2.4%	[2.4%, 2.4%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-4.0%	[-4.9%, -3.2%]	2
All ❌✅ (primary)	-	-	0

Cycles

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

Binary size

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

Bootstrap: 632.146s -> 632.905s (0.12%)

rustbot assigned oli-obk Aug 6, 2023

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 6, 2023

fee1-dead changed the title ~~correctly impl const to bind to host effect param~~ correctly lower impl const to bind to host effect param Aug 6, 2023

This comment has been minimized.

Sign in to view

fee1-dead added 2 commits August 6, 2023 13:34

lower impl const to bind to host effect param

92f4c59

bless tests

6c1e3bb

fee1-dead force-pushed the lower-impl-effect branch from 30d5d1d to 6c1e3bb Compare August 6, 2023 13:35

This comment has been minimized.

Sign in to view

oli-obk reviewed Aug 6, 2023

View reviewed changes

oli-obk reviewed Aug 7, 2023

View reviewed changes

compiler/rustc_hir_analysis/src/collect.rs Outdated Show resolved Hide resolved

Fix ICE

057be38

fee1-dead force-pushed the lower-impl-effect branch from 8d91309 to 057be38 Compare August 7, 2023 17:16

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 7, 2023

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

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 added the merged-by-bors This PR was explicitly merged by bors. label Aug 8, 2023

bors merged commit f88a8b7 into rust-lang:master Aug 8, 2023
12 checks passed

rustbot added this to the 1.73.0 milestone Aug 8, 2023

fee1-dead deleted the lower-impl-effect branch August 9, 2023 01:56

matthiaskrgr mentioned this pull request Aug 27, 2023

ICE: index out of bounds #[rustc_host] #115265

Closed

fee1-dead mentioned this pull request Sep 11, 2023

Tracking Issue for removing impl const and ~const in the standard library #110395

Open

4 tasks

matthiaskrgr mentioned this pull request Jan 7, 2024

ICE: effects: no host param id for call in const yet no errors reported? #119700

Closed

lqd mentioned this pull request Apr 10, 2024

[ICE][miscompile] segv with combined atomic operation and nonnull pointer arithmetic in incremental build #123695

Closed

fee1-dead added the PG-const-traits Project group: Const traits label Aug 9, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

correctly lower `impl const` to bind to host effect param #114545

correctly lower `impl const` to bind to host effect param #114545

fee1-dead commented Aug 6, 2023 •

edited by oli-obk

Loading

This comment has been minimized.

This comment has been minimized.

oli-obk Aug 6, 2023

fee1-dead Aug 6, 2023

oli-obk commented Aug 6, 2023

fee1-dead commented Aug 6, 2023

oli-obk Aug 7, 2023

fee1-dead Aug 7, 2023

oli-obk commented Aug 7, 2023

bors commented Aug 7, 2023

bors commented Aug 8, 2023

bors commented Aug 8, 2023

rust-log-analyzer commented Aug 8, 2023

fee1-dead commented Aug 8, 2023

bors commented Aug 8, 2023

bors commented Aug 8, 2023

rust-timer commented Aug 9, 2023

correctly lower impl const to bind to host effect param #114545

correctly lower impl const to bind to host effect param #114545

Conversation

fee1-dead commented Aug 6, 2023 • edited by oli-obk Loading

This comment has been minimized.

This comment has been minimized.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

oli-obk commented Aug 6, 2023

fee1-dead commented Aug 6, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

oli-obk commented Aug 7, 2023

bors commented Aug 7, 2023

bors commented Aug 8, 2023

bors commented Aug 8, 2023

rust-log-analyzer commented Aug 8, 2023

fee1-dead commented Aug 8, 2023

bors commented Aug 8, 2023

bors commented Aug 8, 2023

rust-timer commented Aug 9, 2023

Overall result: ❌ regressions - no action needed

correctly lower `impl const` to bind to host effect param #114545

correctly lower `impl const` to bind to host effect param #114545

fee1-dead commented Aug 6, 2023 •

edited by oli-obk

Loading