Rollup of 5 pull requests #67704

Dylan-DPC-zz · 2019-12-29T13:08:45Z

Successful merges:

Stabilize attribute macros on inline modules #64273 (Stabilize attribute macros on inline modules)
Work around a resolve bug in const prop #67631 (Work around a resolve bug in const prop)
Resolve long compile times when evaluating always valid constants #67667 (Resolve long compile times when evaluating always valid constants)
resolve: Minor cleanup of duplicate macro reexports #67677 (resolve: Minor cleanup of duplicate macro reexports)
Do not ICE on lifetime error involving closures #67687 (Do not ICE on lifetime error involving closures)

Failed merges:

[const-prop] Remove useless typedef #67682 ([const-prop] Remove useless typedef)

We only want to return specializations when `Reveal::All` is passed, not when `Reveal::UserFacing` is. Resolving this fixes several issues with the `ConstProp`, `SimplifyBranches`, and `Inline` MIR optimization passes. Fixes rust-lang#66901

This extends the existing logic which skips validating every integer or floating point number type to also skip validating empty structs because they are also trivially valid. Fixes rust-lang#67539

…ate more constants during const prop

Stabilize attribute macros on inline modules While still gating non-inline modules in proc macro input. Split from rust-lang#63931 cc rust-lang#54727

@wesleywiser

…sleywiser Work around a resolve bug in const prop r? @wesleywiser @anp This isn't exposed right now, but further changes to rustc may start causing bugs without this.

@oli-obk

…d_constants, r=oli-obk Resolve long compile times when evaluating always valid constants This extends the existing logic which skips validating every integer or floating point number type to also skip validating empty structs because they are also trivially valid. Fixes rust-lang#67539 r? @oli-obk cc @RalfJung @spastorino

resolve: Minor cleanup of duplicate macro reexports Enabled by rust-lang#65785 which changed `duplicate_macro_exports` from a lint to a hard error.

Do not ICE on lifetime error involving closures Fix rust-lang#67634.

Dylan-DPC-zz · 2019-12-29T13:35:14Z

@bors r+ rollup=never p=5

bors · 2019-12-29T13:35:16Z

📌 Commit 18a51bd has been approved by Dylan-DPC

bors · 2019-12-29T15:17:04Z

⌛ Testing commit 18a51bd with merge d897fb5a94c352df98f9f94d4eec88f6a239c967...

rust-highfive · 2019-12-29T16:12:36Z

The job i686-apple of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

2019-12-29T16:04:54.6280930Z test [ui] ui/lifetimes/lifetime-errors/ex3-both-anon-regions.rs ... ok
2019-12-29T16:04:54.6528180Z test [ui] ui/lifetimes/lifetime-errors/liveness-assign-imm-local-notes.rs ... ok
2019-12-29T16:04:54.7244660Z test [ui] ui/lifetimes/lifetime-no-keyword.rs ... ok
2019-12-29T16:04:54.7297940Z test [ui] ui/lifetimes/lifetime-mismatch-between-trait-and-impl.rs ... ok
2019-12-29T16:04:54.7732270Z test [ui] ui/lifetimes/unnamed-closure-doesnt-life-long-enough-issue-67634.rs ... ok
2019-12-29T16:04:55.2620360Z test [ui] ui/linkage-attr/linkage-detect-local-generated-name-collision.rs ... ok
2019-12-29T16:04:55.2720860Z test [ui] ui/link-cfg-works.rs ... ok
2019-12-29T16:04:55.3585670Z test [ui] ui/linkage-attr/linkage-detect-extern-generated-name-collision.rs ... ok
2019-12-29T16:04:55.5132460Z test [ui] ui/linkage-attr/linkage2.rs ... ok
---
2019-12-29T16:10:21.2621270Z ---- [ui] ui/consts/huge-values.rs stdout ----
2019-12-29T16:10:21.2621340Z 
2019-12-29T16:10:21.2621860Z error: test compilation failed although it shouldn't!
2019-12-29T16:10:21.2621950Z status: exit code: 1
2019-12-29T16:10:21.2623460Z command: "/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/stage2/bin/rustc" "/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/stage2/bin/rustc" "/Users/runner/runners/2.163.1/work/1/s/src/test/ui/consts/huge-values.rs" "-Zthreads=1" "--target=i686-apple-darwin" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "--out-dir" "/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/test/ui/consts/huge-values" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/native/rust-test-helpers" "-L" "/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/test/ui/consts/huge-values/auxiliary" "-A" "unused"
2019-12-29T16:10:21.2624400Z ------------------------------------------
2019-12-29T16:10:21.2624470Z 
2019-12-29T16:10:21.2624970Z ------------------------------------------
2019-12-29T16:10:21.2625070Z stderr:
2019-12-29T16:10:21.2625070Z stderr:
2019-12-29T16:10:21.2625590Z ------------------------------------------
2019-12-29T16:10:21.2625700Z error: the type `[u8; 4000000000]` is too big for the current architecture
2019-12-29T16:10:21.2626290Z   --> /Users/runner/runners/2.163.1/work/1/s/src/test/ui/consts/huge-values.rs:8:13
2019-12-29T16:10:21.2626390Z    |
2019-12-29T16:10:21.2626460Z LL |     let _ = [0u8; 4_000_000_000];
2019-12-29T16:10:21.2626590Z 
2019-12-29T16:10:21.2626650Z error: aborting due to previous error
2019-12-29T16:10:21.2626690Z 
2019-12-29T16:10:21.2626740Z 
---
2019-12-29T16:10:21.2690910Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:385:22
2019-12-29T16:10:21.2691100Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-12-29T16:10:21.2707110Z 
2019-12-29T16:10:21.2707250Z 
2019-12-29T16:10:21.2710850Z command did not execute successfully: "/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/stage0-tools-bin/compiletest" "/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/stage0-tools-bin/compiletest" "--compile-lib-path" "/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/stage2/lib" "--run-lib-path" "/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/stage2/lib/rustlib/i686-apple-darwin/lib" "--rustc-path" "/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/stage2/bin/rustc" "--src-base" "/Users/runner/runners/2.163.1/work/1/s/src/test/ui" "--build-base" "/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/test/ui" "--stage-id" "stage2-i686-apple-darwin" "--mode" "ui" "--target" "i686-apple-darwin" "--host" "i686-apple-darwin" "--llvm-filecheck" "/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/llvm/build/bin/FileCheck" "--nodejs" "/usr/local/bin/node" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/Users/runner/runners/2.163.1/work/1/s/build/i686-apple-darwin/native/rust-test-helpers" "--docck-python" "/usr/local/bin/python2.7" "--lldb-python" "/usr/bin/python" "--lldb-version" "lldb-902.0.79.2\n  Swift-4.1\n" "--lldb-python-dir" "/Applications/Xcode_9.3.app/Contents/SharedFrameworks/LLDB.framework/Resources/Python" "--llvm-version" "9.0.0-rust-1.42.0-nightly\n" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2019-12-29T16:10:21.2712130Z 
2019-12-29T16:10:21.2712190Z 
2019-12-29T16:10:21.2721320Z failed to run: /Users/runner/runners/2.163.1/work/1/s/build/bootstrap/debug/bootstrap test
2019-12-29T16:10:21.2721550Z Build completed unsuccessfully in 0:48:37
2019-12-29T16:10:21.2721550Z Build completed unsuccessfully in 0:48:37
2019-12-29T16:10:21.2787200Z == clock drift check ==
2019-12-29T16:10:21.2830690Z   local time: Sun Dec 29 16:10:21 UTC 2019
2019-12-29T16:10:21.3556670Z   network time: Sun, 29 Dec 2019 16:10:21 GMT
2019-12-29T16:10:21.3558520Z == end clock drift check ==
2019-12-29T16:10:21.3598850Z 
2019-12-29T16:10:21.3709750Z ##[error]Bash exited with code '1'.
2019-12-29T16:10:21.3766840Z ##[section]Starting: Checkout
2019-12-29T16:10:21.3769660Z ==============================================================================
2019-12-29T16:10:21.3769750Z Task         : Get sources
2019-12-29T16:10:21.3769840Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

bors · 2019-12-29T16:12:52Z

💔 Test failed - checks-azure

wesleywiser and others added 13 commits December 27, 2019 13:04

Work around a resolve bug in const prop

3eb0585

Prevent polymorphic const prop on assignments

b3abebd

Stabilize attribute macros on inline modules

e3155ab

resolve: Minor cleanup of duplicate macro reexports

a0d8b79

Resolve long compile times when evaluating always valid constants

31e1c41

This extends the existing logic which skips validating every integer or floating point number type to also skip validating empty structs because they are also trivially valid. Fixes rust-lang#67539

Do not ICE on lifetime error involving closures

5e1b366

Ensure that we don't cause *new* hard errors if we suddenly can evalu…

5fd8abd

…ate more constants during const prop

Rollup merge of rust-lang#64273 - petrochenkov:stabattrmod, r=Centril

2d632e7

Stabilize attribute macros on inline modules While still gating non-inline modules in proc macro input. Split from rust-lang#63931 cc rust-lang#54727

Rollup merge of rust-lang#67631 - oli-obk:polymorphic_promotion, r=we…

6dc19a3

…sleywiser Work around a resolve bug in const prop r? @wesleywiser @anp This isn't exposed right now, but further changes to rustc may start causing bugs without this.

Rollup merge of rust-lang#67677 - petrochenkov:dupexp, r=Centril

b7fc120

resolve: Minor cleanup of duplicate macro reexports Enabled by rust-lang#65785 which changed `duplicate_macro_exports` from a lint to a hard error.

Rollup merge of rust-lang#67687 - estebank:issue-67634, r=matthewjasper

18a51bd

Do not ICE on lifetime error involving closures Fix rust-lang#67634.

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 29, 2019

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 Dec 29, 2019

JohnTitor mentioned this pull request Dec 29, 2019

Resolve long compile times when evaluating always valid constants #67667

Merged

Centril closed this Dec 29, 2019

JohnTitor added the rollup A PR which is a rollup label Dec 29, 2019

Dylan-DPC-zz deleted the rollup-kbs500y branch April 1, 2020 20:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 5 pull requests #67704

Rollup of 5 pull requests #67704

Dylan-DPC-zz commented Dec 29, 2019

Dylan-DPC-zz commented Dec 29, 2019

bors commented Dec 29, 2019

bors commented Dec 29, 2019

rust-highfive commented Dec 29, 2019

bors commented Dec 29, 2019

Rollup of 5 pull requests #67704

Rollup of 5 pull requests #67704

Conversation

Dylan-DPC-zz commented Dec 29, 2019

Dylan-DPC-zz commented Dec 29, 2019

bors commented Dec 29, 2019

bors commented Dec 29, 2019

rust-highfive commented Dec 29, 2019

bors commented Dec 29, 2019