Rollup of 5 pull requests #113330

matthiaskrgr · 2023-07-04T15:46:29Z

Successful merges:

assemble_candidates_after_normalizing_self_ty docs #113192 (assemble_candidates_after_normalizing_self_ty docs)
Use scoped-tls for SMIR to map between TyCtxt and SMIR datastructures #113251 (Use scoped-tls for SMIR to map between TyCtxt and SMIR datastructures)
Update platform-support.md to improve ARM target descriptions #113282 (Update platform-support.md to improve ARM target descriptions)
add flag for enabling global cache usage for proof trees and printing proof trees on error #113296 (add flag for enabling global cache usage for proof trees and printing proof trees on error)
implement ConstEvaluatable goals in new solver #113324 (implement ConstEvaluatable goals in new solver)

r? @ghost
@rustbot modify labels: rollup

Updates the descriptions of the various ARM targets in platform-support.md so they are a little more consistent. For example, all instances of ARMv7 changed to ARMv7-A (as opposed to ARMv7-R and ARMv7-M).

we don't yet handle `generic_const_exprs`, someone else can do that :3

`assemble_candidates_after_normalizing_self_ty` docs I already explained that in different places a few times, should have added that explanation as a doc comment the first time I did so :3 r? `@BoxyUwU`

… r=oli-obk Use scoped-tls for SMIR to map between TyCtxt and SMIR datastructures Fixes rust-lang#112940 r? `@oli-obk`

…descriptions, r=JohnTitor Update platform-support.md to improve ARM target descriptions Updates the descriptions of the various ARM targets in platform-support.md so they are a little more consistent. For example, all instances of ARMv7 are changed to ARMv7-A (as opposed to ARMv7-R and ARMv7-M). I also remove the Cortex-Mx CPUs on the thumbv6/7m targets, as most of the other targets refer only to CPU architectures and not specific CPUs (and the list was missing on thumbv8m anyway, so this is more consistent).

add flag for enabling global cache usage for proof trees and printing proof trees on error This adds a few new things: - `-Zdump-solver-proof-tree=always/never/on-error` - `always`/`never` were previosuly specifiable by whether the flag exists or not, th new flag is `on_error` which reruns obligations of fulfillment and selection errors with proof tree generation enabled and prints them out - `-Zdump-solver-proof-tree-uses-cache` - allows forcing global cache to be used or unused for all generated proof trees, global cache is enabled by default for `always` so that it accurately represents what happend. This flag currently would affect misc uses of `GenerateProofTree::Yes` which will be added in the future for things like diagnostics logic and rustdoc's auto_trait file. We can fix this when we start using proof tree generation for those use cases if it's desirable. I also changed the output to go straight to stdout instead of going through `debug!` so that `-Zdump-solver-proof-tree` can be adequately used on `nightly` not just a locally built toolchain. The idea for `on-error` is that it should hopefully make it easier to quickly figure out "why doesnt this code compile"- you just pass in `-Zdump-solver-proof-tree=on-error` and you'll only get proof trees you care about. --- r? `@lcnr` `@compiler-errors`

…yUwU implement `ConstEvaluatable` goals in new solver this only supports stable const generics. `feature(generic_const_exprs)` needs to extend that function is non-trivial ways. Leaving this for someone else or some later date. r? `@BoxyUwU`

matthiaskrgr · 2023-07-04T15:54:23Z

@bors r+

bors · 2023-07-04T15:54:25Z

📌 Commit 494e67c has been approved by matthiaskrgr

It is now in the queue for this repository.

matthiaskrgr · 2023-07-04T15:54:36Z

@bors rollup=never p=5

bors · 2023-07-04T16:33:27Z

⌛ Testing commit 494e67c with merge 43ed332aa6cdd3f7a96774bfe64dfdec4569798d...

bors · 2023-07-04T17:15:24Z

💔 Test failed - checks-actions

rust-log-analyzer · 2023-07-04T18:12:14Z

The job mingw-check-tidy failed! Check out the build log: (web) (plain)

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

Prepare all required actions
Getting action download info
Download action repository 'actions/checkout@v3' (SHA:c85c95e3d7251135ab7dc9ce3241c5835cc595a9)
Download action repository 'actions/upload-artifact@v3' (SHA:0b7f8abb1508181956e8e162db84b466c27e18ce)
Complete job name: PR - mingw-check-tidy
git config --global core.autocrlf false
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}
env:
  CI_JOB_NAME: mingw-check-tidy
---
Building wheels for collected packages: reuse
  Building wheel for reuse (pyproject.toml): started
  Building wheel for reuse (pyproject.toml): finished with status 'done'
  Created wheel for reuse: filename=reuse-1.1.0-cp310-cp310-manylinux_2_35_x86_64.whl size=180116 sha256=351235b2326fb4db7a18e257e13ce7896c5f77339521e2c2612e71e154800a19
  Stored in directory: /tmp/pip-ephem-wheel-cache-5l0hhymq/wheels/c2/3c/b9/1120c2ab4bd82694f7e6f0537dc5b9a085c13e2c69a8d0c76d
Installing collected packages: boolean-py, binaryornot, setuptools, reuse, python-debian, markupsafe, license-expression, jinja2, chardet
  Attempting uninstall: setuptools
    Found existing installation: setuptools 59.6.0
    Not uninstalling setuptools at /usr/lib/python3/dist-packages, outside environment /usr
---
Successfully tagged rust-ci:latest
Built container sha256:605896221a71abd681f0c7b28676583bfb5be578340285085abbb33575dd520a
Uploading finished image to https://ci-caches.rust-lang.org/docker/39289e18f1ac1b1a573d1a3c658528cab0cbfec4029e2def8ed615ecd4b1295e23213ab5b134f4a50a4bd45af0a8a4266b7571ba256dc217696d0f040efcd003

<botocore.awsrequest.AWSRequest object at 0x7f265e084610>
gzip: stdout: Broken pipe
xargs: docker: terminated by signal 13
[CI_JOB_NAME=mingw-check-tidy]
[CI_JOB_NAME=mingw-check-tidy]
---
curl: (22) The requested URL returned error: 404

error: failed to download llvm from ci

    help: old builds get deleted after a certain time
    help: if trying to compile an old commit of rustc, disable `download-ci-llvm` in config.toml:
    [llvm]
    download-ci-llvm = false
    
Build completed unsuccessfully in 0:00:00

matthiaskrgr · 2023-07-04T21:04:05Z

@bors retry

matthiaskrgr · 2023-07-04T21:54:19Z

@bors r+ rollup=never p=5

bors · 2023-07-04T21:54:21Z

📌 Commit 7996908 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-07-04T23:51:56Z

⌛ Testing commit 7996908 with merge b7bc6f8...

bors · 2023-07-05T02:10:13Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing b7bc6f8 to master...

rust-timer · 2023-07-05T02:11:39Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#113192	`assemble_candidates_after_normalizing_self_ty` docs	`ea8c5eedb988803ca5f8c362a324b51dbfa5f515` (link)
#113251	Use scoped-tls for SMIR to map between TyCtxt and SMIR dat…	`e0ad6529db90617cbd859f0d5af74d6ae1c3bd40` (link)
#113282	Update platform-support.md to improve ARM target descriptio…	`6e8c99762ffa3786e50e05bb63b9366ff0c2cb75` (link)
#113296	add flag for enabling global cache usage for proof trees an…	`4d46cddef155cf98d75841528bb2b2c2e5a270ba` (link)
#113324	implement `ConstEvaluatable` goals in new solver	`abf517c1d005dbc96a984883a26f183dfb438680` (link)

previous master: f20afcc455

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-timer · 2023-07-05T05:17:53Z

Finished benchmarking commit (b7bc6f8): 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
Regressions ❌ (secondary)	1.2%	[1.2%, 1.2%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

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)	3.1%	[2.6%, 3.6%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
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)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.2%	[-2.2%, -2.2%]	1
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 653.078s -> 653.897s (0.13%)

lcnr and others added 14 commits June 30, 2023 11:56

assemble_candidates_after_normalizing_self_ty docs

0176922

Use scoped-tls for SMIR to map between TyCtxt and SMIR datastructures

361df86

Update platform-support.md

d8790b8

Updates the descriptions of the various ARM targets in platform-support.md so they are a little more consistent. For example, all instances of ARMv7 changed to ARMv7-A (as opposed to ARMv7-R and ARMv7-M).

add flag for disabling global cache and printing proof trees on error

040aa58

reviews

2ad00f4

change flag name

adefeb8

move logic for flags into separate function

276d628

implement ConstEvaluatable goals in new solver

abcaf30

we don't yet handle `generic_const_exprs`, someone else can do that :3

reviews

284b614

Rollup merge of rust-lang#113192 - lcnr:add-comment, r=compiler-errors

6fb790a

`assemble_candidates_after_normalizing_self_ty` docs I already explained that in different places a few times, should have added that explanation as a doc comment the first time I did so :3 r? `@BoxyUwU`

Rollup merge of rust-lang#113251 - chenyukang:yukang-fix-112940-smir,…

d3fae79

… r=oli-obk Use scoped-tls for SMIR to map between TyCtxt and SMIR datastructures Fixes rust-lang#112940 r? `@oli-obk`

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

This comment has been minimized.

Sign in to view

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

fmease mentioned this pull request Jul 4, 2023

Revert the lexing of c"…" string literals #113334

Merged

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

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 5, 2023

bors merged commit b7bc6f8 into rust-lang:master Jul 5, 2023
7 of 11 checks passed

rustbot added this to the 1.72.0 milestone Jul 5, 2023

This was referenced Jul 5, 2023

Implement a few more rvalue translation to smir #112717

Merged

Prototype: Add unstable -Z reference-niches option #113166

Merged

Add some extra information to opaque type cycle errors #113320

Merged

matthiaskrgr deleted the rollup-zm3owin branch March 16, 2024 18:20

lqd mentioned this pull request May 30, 2024

ICE: !self.intercrate #125767

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 5 pull requests #113330

Rollup of 5 pull requests #113330

matthiaskrgr commented Jul 4, 2023

matthiaskrgr commented Jul 4, 2023

bors commented Jul 4, 2023

matthiaskrgr commented Jul 4, 2023

bors commented Jul 4, 2023

This comment has been minimized.

bors commented Jul 4, 2023

rust-log-analyzer commented Jul 4, 2023

matthiaskrgr commented Jul 4, 2023

matthiaskrgr commented Jul 4, 2023

bors commented Jul 4, 2023

bors commented Jul 4, 2023

bors commented Jul 5, 2023

rust-timer commented Jul 5, 2023

rust-timer commented Jul 5, 2023

Rollup of 5 pull requests #113330

Rollup of 5 pull requests #113330

Conversation

matthiaskrgr commented Jul 4, 2023

matthiaskrgr commented Jul 4, 2023

bors commented Jul 4, 2023

matthiaskrgr commented Jul 4, 2023

bors commented Jul 4, 2023

This comment has been minimized.

bors commented Jul 4, 2023

rust-log-analyzer commented Jul 4, 2023

matthiaskrgr commented Jul 4, 2023

matthiaskrgr commented Jul 4, 2023

bors commented Jul 4, 2023

bors commented Jul 4, 2023

bors commented Jul 5, 2023

rust-timer commented Jul 5, 2023

rust-timer commented Jul 5, 2023

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size