WIP Add a shim for functions annotated with `#[track_caller]` (RFC 2091 #2/N) #65082

anp · 2019-10-04T02:16:08Z

Depends on: #65037
Tracking issue: #47809
RFC text

TODO:

add a ReifyShim that is similar to VirtualShim in behavior (see Implement by-value object safety #54183)
add ty::Instance::resolve_for_fn_ptr (leave ty::Instance::resolve_vtable alone), migrate appropriate callers
- TODO list callers here that need migration?
resolve_for_fn_ptr returns the shim if calling a #[track_caller] function

rust-highfive · 2019-10-04T02:16:11Z

Some changes occurred in diagnostic error codes

cc @GuillaumeGomez

rust-highfive · 2019-10-04T02:16:12Z

r? @matthewjasper

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

GuillaumeGomez

Just for precision: I ask for failing examples not only for consistency but also to be sure that the error code will still be used by the compiler.

src/librustc/error_codes.rs

src/librustc/hir/check_attr.rs

src/librustc_typeck/error_codes.rs

anp · 2019-10-04T14:28:07Z

also to be sure that the error code will still be used by the compiler.

Do you mean this as a test? There are some UI tests that do this.

Also minor nit: the diffs you reviewed are from #65037.

GuillaumeGomez · 2019-10-04T14:38:06Z

@anp Consider this as a backup. It'll at least force the one removing the error code to update the long error explanation.

rust-highfive · 2019-10-04T23:27:13Z

The job x86_64-gnu-llvm-6.0 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-10-04T21:40:44.0641462Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-10-04T21:40:44.0860347Z ##[command]git config gc.auto 0
2019-10-04T21:40:44.0915981Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-10-04T21:40:44.0999860Z ##[command]git config --get-all http.proxy
2019-10-04T21:40:44.1156938Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/65082/merge:refs/remotes/pull/65082/merge
---
2019-10-04T22:40:37.4488678Z .................................................................................................... 1500/9111
2019-10-04T22:40:44.3477161Z .................................................................................................... 1600/9111
2019-10-04T22:40:53.0972768Z .................................................................................................... 1700/9111
2019-10-04T22:41:02.2316637Z .......i...............i............................................................................ 1800/9111
2019-10-04T22:41:09.2458255Z ..................................................................................................ii 1900/9111
2019-10-04T22:41:25.1253319Z iii................................................................................................. 2000/9111
2019-10-04T22:41:33.7725042Z .................................................................................................... 2200/9111
2019-10-04T22:41:36.3746988Z .................................................................................................... 2300/9111
2019-10-04T22:41:42.5468104Z .................................................................................................... 2400/9111
2019-10-04T22:41:47.9395570Z .................................................................................................... 2500/9111
---
2019-10-04T22:44:42.2136023Z ........................................................................................i........... 4700/9111
2019-10-04T22:44:50.1083238Z ....i............................................................................................... 4800/9111
2019-10-04T22:45:00.6864942Z .................................................................................................... 4900/9111
2019-10-04T22:45:06.3538776Z .................................................................................................... 5000/9111
2019-10-04T22:45:18.6378672Z .................................................................................ii.ii.............. 5100/9111
2019-10-04T22:45:28.0852948Z .................................................................................................... 5300/9111
2019-10-04T22:45:38.1528945Z .................................................................................................... 5400/9111
2019-10-04T22:45:45.0836933Z ...............................................i.................................................... 5500/9111
2019-10-04T22:45:51.9040481Z .................................................................................................... 5600/9111
2019-10-04T22:45:51.9040481Z .................................................................................................... 5600/9111
2019-10-04T22:46:02.3586560Z .................................................................................................... 5700/9111
2019-10-04T22:46:10.1101139Z ............................................ii...i..ii...........i.................................. 5800/9111
2019-10-04T22:46:35.8050044Z .................................................................................................... 6000/9111
2019-10-04T22:46:44.1237280Z .................................................................................................... 6100/9111
2019-10-04T22:46:44.1237280Z .................................................................................................... 6100/9111
2019-10-04T22:46:54.9541671Z ..................................................i..ii............................................. 6200/9111
2019-10-04T22:47:18.8240179Z .................................................................................................... 6400/9111
2019-10-04T22:47:20.9803526Z ..........i......................................................................................... 6500/9111
2019-10-04T22:47:23.1728607Z ..................................................................................i................. 6600/9111
2019-10-04T22:47:25.8446650Z .................................................................................................... 6700/9111
---
2019-10-04T22:51:56.2615820Z  finished in 5.642
2019-10-04T22:51:56.2808957Z Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-04T22:51:56.4475858Z 
2019-10-04T22:51:56.4476171Z running 150 tests
2019-10-04T22:51:59.6850494Z i....iii......iii..iiii....i.............................i..i..................i....i.........ii.i.i 100/150
2019-10-04T22:52:01.6788308Z ..iiii..............i.........iii.i.......ii......
2019-10-04T22:52:01.6789623Z 
2019-10-04T22:52:01.6792947Z  finished in 5.398
2019-10-04T22:52:01.6969527Z Check compiletest suite=codegen-units mode=codegen-units (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-04T22:52:02.5270112Z 
---
2019-10-04T22:52:03.9744377Z  finished in 2.277
2019-10-04T22:52:03.9939856Z Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-04T22:52:04.1562019Z 
2019-10-04T22:52:04.1562258Z running 9 tests
2019-10-04T22:52:04.1563193Z iiiiiiiii
2019-10-04T22:52:04.1563611Z 
2019-10-04T22:52:04.1563681Z  finished in 0.162
2019-10-04T22:52:04.1749100Z Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-04T22:52:05.0228154Z 
---
2019-10-04T22:52:22.1976537Z  finished in 18.022
2019-10-04T22:52:22.2162908Z Check compiletest suite=debuginfo mode=debuginfo-gdb+lldb (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-04T22:52:22.3791620Z 
2019-10-04T22:52:22.3792538Z running 123 tests
2019-10-04T22:52:45.8762618Z .iiiii...i.....i..i...i..i.i.i..i.ii..i.i.....i..i....ii..........iiii..........i...ii...i.......ii. 100/123
2019-10-04T22:52:50.4850790Z i.i.i......iii.i.....ii
2019-10-04T22:52:50.4852377Z 
2019-10-04T22:52:50.4856345Z  finished in 28.269
2019-10-04T22:52:50.4866566Z Uplifting stage1 rustc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-04T22:52:50.4867290Z Copying stage2 rustc from stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
---
2019-10-04T23:04:57.6936923Z 
2019-10-04T23:04:57.6938696Z    Doc-tests core
2019-10-04T23:05:02.2916573Z 
2019-10-04T23:05:02.2917962Z running 2405 tests
2019-10-04T23:05:12.8163224Z ......iiiii......................................................................................... 100/2405
2019-10-04T23:05:23.2443683Z ...............................................................................ii................... 200/2405
2019-10-04T23:05:46.8863100Z .i.................................................................................................. 400/2405
2019-10-04T23:05:46.8863100Z .i.................................................................................................. 400/2405
2019-10-04T23:05:56.9145224Z ................................................i..i.................iiii........................... 500/2405
2019-10-04T23:06:16.3228537Z .................................................................................................... 700/2405
2019-10-04T23:06:26.1611802Z .................................................................................................... 800/2405
2019-10-04T23:06:36.1495215Z .................................................................................................... 900/2405
2019-10-04T23:06:45.9845572Z .................................................................................................... 1000/2405
---
2019-10-04T23:10:41.5081239Z 
2019-10-04T23:10:41.5081512Z running 992 tests
2019-10-04T23:11:01.5968050Z i................................................................................................... 100/992
2019-10-04T23:11:12.4529203Z .................................................................................................... 200/992
2019-10-04T23:11:20.2419628Z .................iii......i......i...i......i....................................................... 300/992
2019-10-04T23:11:25.6100522Z .................................................................................................... 400/992
2019-10-04T23:11:32.9054003Z ...................................i..i.................................ii.......................... 500/992
2019-10-04T23:11:46.9573194Z .................................................................................................... 700/992
2019-10-04T23:11:46.9573194Z .................................................................................................... 700/992
2019-10-04T23:11:54.7293467Z ..................iiii.............................................................................. 800/992
2019-10-04T23:12:08.8589932Z .................................................................................................... 900/992
2019-10-04T23:12:16.0621192Z ........................................iiii................................................
2019-10-04T23:12:16.0623875Z 
2019-10-04T23:12:16.0680022Z  finished in 181.891
2019-10-04T23:12:16.0697368Z Testing term stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-04T23:12:16.2710573Z    Compiling term v0.0.0 (/checkout/src/libterm)
---
2019-10-04T23:27:06.6418964Z == clock drift check ==
2019-10-04T23:27:06.6418999Z   local time: Fri Oct  4 23:27:06 UTC 2019
2019-10-04T23:27:06.9005134Z   network time: Fri, 04 Oct 2019 23:27:06 GMT
2019-10-04T23:27:06.9007613Z == end clock drift check ==
2019-10-04T23:27:08.0641486Z ##[error]Bash exited with code '1'.
2019-10-04T23:27:08.0683015Z ##[section]Starting: Checkout
2019-10-04T23:27:08.0684871Z ==============================================================================
2019-10-04T23:27:08.0685086Z Task         : Get sources
2019-10-04T23:27:08.0685154Z 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)

- The attribute is behind a feature gate. - Error if both #[naked] and #[track_caller] are applied to the same function. - Error if #[track_caller] is applied to a non-function item. - Error if ABI is not "rust" - Error if #[track_caller] is applied to a trait function. Error codes and descriptions are pending.

Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>

Prevents number collision with another approved PR.

rust-highfive · 2019-10-05T18:01:00Z

The job x86_64-gnu-llvm-6.0 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-10-05T16:04:06.0582768Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-10-05T16:04:06.0807250Z ##[command]git config gc.auto 0
2019-10-05T16:04:06.0893673Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-10-05T16:04:06.0955840Z ##[command]git config --get-all http.proxy
2019-10-05T16:04:06.1116677Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/65082/merge:refs/remotes/pull/65082/merge
---
2019-10-05T17:08:44.6624095Z .................................................................................................... 1500/9113
2019-10-05T17:08:51.9727384Z .................................................................................................... 1600/9113
2019-10-05T17:09:01.4949456Z .................................................................................................... 1700/9113
2019-10-05T17:09:11.4079366Z .......i...............i............................................................................ 1800/9113
2019-10-05T17:09:18.9987154Z ..................................................................................................ii 1900/9113
2019-10-05T17:09:36.6749341Z iii................................................................................................. 2000/9113
2019-10-05T17:09:46.0562335Z .................................................................................................... 2200/9113
2019-10-05T17:09:48.8595543Z .................................................................................................... 2300/9113
2019-10-05T17:09:55.4763384Z .................................................................................................... 2400/9113
2019-10-05T17:10:01.4996916Z .................................................................................................... 2500/9113
---
2019-10-05T17:13:04.7378625Z ........................................................................................i........... 4700/9113
2019-10-05T17:13:12.9975780Z ....i............................................................................................... 4800/9113
2019-10-05T17:13:24.1829956Z .................................................................................................... 4900/9113
2019-10-05T17:13:30.2263379Z .................................................................................................... 5000/9113
2019-10-05T17:13:43.1612027Z .................................................................................ii.ii.............. 5100/9113
2019-10-05T17:13:53.1205431Z .................................................................................................... 5300/9113
2019-10-05T17:14:03.7085890Z .................................................................................................... 5400/9113
2019-10-05T17:14:10.9569340Z ...............................................i.................................................... 5500/9113
2019-10-05T17:14:18.3108163Z .................................................................................................... 5600/9113
2019-10-05T17:14:18.3108163Z .................................................................................................... 5600/9113
2019-10-05T17:14:29.3466259Z .................................................................................................... 5700/9113
2019-10-05T17:14:37.4339625Z ............................................ii...i..ii...........i.................................. 5800/9113
2019-10-05T17:15:04.4334625Z .................................................................................................... 6000/9113
2019-10-05T17:15:14.2376322Z .................................................................................................... 6100/9113
2019-10-05T17:15:14.2376322Z .................................................................................................... 6100/9113
2019-10-05T17:15:28.8322139Z ..................................................i..ii............................................. 6200/9113
2019-10-05T17:15:54.1817428Z .................................................................................................... 6400/9113
2019-10-05T17:15:56.4520298Z ..........i......................................................................................... 6500/9113
2019-10-05T17:15:58.8633361Z ..................................................................................i................. 6600/9113
2019-10-05T17:16:01.7485008Z .................................................................................................... 6700/9113
---
2019-10-05T17:20:53.3436808Z  finished in 5.767
2019-10-05T17:20:53.3641183Z Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-05T17:20:53.5626718Z 
2019-10-05T17:20:53.5626953Z running 150 tests
2019-10-05T17:20:56.9537688Z i....iii......iii..iiii....i.............................i..i..................i....i.........ii.i.i 100/150
2019-10-05T17:20:59.1099817Z ..iiii..............i.........iii.i.......ii......
2019-10-05T17:20:59.1101933Z 
2019-10-05T17:20:59.1105216Z  finished in 5.746
2019-10-05T17:20:59.1302374Z Check compiletest suite=codegen-units mode=codegen-units (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-05T17:20:59.3034882Z 
---
2019-10-05T17:21:01.5046421Z  finished in 2.374
2019-10-05T17:21:01.5249684Z Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-05T17:21:01.6935013Z 
2019-10-05T17:21:01.6935237Z running 9 tests
2019-10-05T17:21:01.6936162Z iiiiiiiii
2019-10-05T17:21:01.6936582Z 
2019-10-05T17:21:01.6936635Z  finished in 0.168
2019-10-05T17:21:01.7151390Z Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-05T17:21:01.9064121Z 
---
2019-10-05T17:21:21.0786959Z  finished in 19.363
2019-10-05T17:21:21.1010440Z Check compiletest suite=debuginfo mode=debuginfo-gdb+lldb (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-05T17:21:21.2853993Z 
2019-10-05T17:21:21.2854191Z running 123 tests
2019-10-05T17:21:47.0345836Z .iiiii...i.....i..i...i..i.i.i..i.ii..i.i.....i..i....ii..........iiii..........i...ii...i.......ii. 100/123
2019-10-05T17:21:52.0071756Z i.i.i......iii.i.....ii
2019-10-05T17:21:52.0074054Z 
2019-10-05T17:21:52.0079339Z  finished in 30.907
2019-10-05T17:21:52.0090732Z Uplifting stage1 rustc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-05T17:21:52.0091188Z Copying stage2 rustc from stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
---
2019-10-05T17:35:35.8987336Z 
2019-10-05T17:35:35.9012704Z    Doc-tests core
2019-10-05T17:35:40.9973649Z 
2019-10-05T17:35:40.9974590Z running 2405 tests
2019-10-05T17:35:53.1855995Z ......iiiii......................................................................................... 100/2405
2019-10-05T17:36:05.2898015Z ...............................................................................ii................... 200/2405
2019-10-05T17:36:33.0654300Z .i.................................................................................................. 400/2405
2019-10-05T17:36:33.0654300Z .i.................................................................................................. 400/2405
2019-10-05T17:36:44.5560978Z ................................................i..i.................iiii........................... 500/2405
2019-10-05T17:37:06.9339827Z .................................................................................................... 700/2405
2019-10-05T17:37:18.3610779Z .................................................................................................... 800/2405
2019-10-05T17:37:29.6499310Z .................................................................................................... 900/2405
2019-10-05T17:37:40.8043200Z .................................................................................................... 1000/2405
---
2019-10-05T17:42:01.5404784Z thread '<unnamed>' panicked at 'explicit panic', src/libstd/sync/mutex.rs:689:13
2019-10-05T17:42:01.5405058Z thread '<unnamed>' panicked at 'assertion failed: `(left == right)`
2019-10-05T17:42:01.5517230Z   left: `1`,
2019-10-05T17:42:01.5518288Z  right: `2`', src/libstd/sync/mutex.rs:653:13
2019-10-05T17:42:01.5519214Z .......thread '<unnamed>' panicked at 'test panic in inner thread to poison RwLock', src/libstd/sync/rwlock.rs:791:13
2019-10-05T17:42:01.5520305Z ...thread '.<unnamed>' panicked at 'test panic in inner thread to poison RwLock', src/libstd/sync/rwlock.rs:768:13
2019-10-05T17:42:01.5520738Z .thread '<unnamed>' panicked at 'explicit panic', src/libstd/sync/rwlock.rs:705:13
2019-10-05T17:42:01.5524175Z ..thread '<unnamed>' panicked at 'explicit panic', src/libstd/sync/rwlock.rs:635:13
2019-10-05T17:42:01.5538674Z thread '<unnamed>' panicked at 'explicit panic', src/libstd/sync/rwlock.rs:611:13
2019-10-05T17:42:01.5541247Z thread '<unnamed>' panicked at 'explicit panic', src/libstd/sync/rwlock.rs:623:13
2019-10-05T17:42:03.6035999Z ............................thread '<unnamed>' panicked at 'What the answer to my lifetimes dilemma is?', src/libstd/sys_common/remutex.rs:233:13
2019-10-05T17:42:03.6092799Z ........................ 700/763
---
2019-10-05T17:42:11.0139907Z 
2019-10-05T17:42:11.0140977Z running 992 tests
2019-10-05T17:42:34.5285622Z i................................................................................................... 100/992
2019-10-05T17:42:47.1511602Z .................................................................................................... 200/992
2019-10-05T17:42:56.1408285Z .................iii......i......i...i......i....................................................... 300/992
2019-10-05T17:43:02.3139416Z .................................................................................................... 400/992
2019-10-05T17:43:10.8074034Z ...................................i..i.................................ii.......................... 500/992
2019-10-05T17:43:27.1275841Z .................................................................................................... 700/992
2019-10-05T17:43:27.1275841Z .................................................................................................... 700/992
2019-10-05T17:43:36.1073900Z ..................iiii.............................................................................. 800/992
2019-10-05T17:43:52.3716693Z .................................................................................................... 900/992
2019-10-05T17:44:00.5687018Z ........................................iiii................................................
2019-10-05T17:44:00.5690281Z 
2019-10-05T17:44:00.5756428Z  finished in 208.250
2019-10-05T17:44:00.5773712Z Testing term stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-10-05T17:44:00.7920092Z    Compiling term v0.0.0 (/checkout/src/libterm)
---
2019-10-05T18:00:55.4066941Z ---- /checkout/obj/build/x86_64-unknown-linux-gnu/test/error-index.md - Rust_Compiler_Error_Index::E0738 (line 12390) stdout ----
2019-10-05T18:00:55.4067014Z error: expected identifier, found `!`
2019-10-05T18:00:55.4067285Z  --> /checkout/obj/build/x86_64-unknown-linux-gnu/test/error-index.md:12391:3
2019-10-05T18:00:55.4067346Z   |
2019-10-05T18:00:55.4067396Z 3 | #[!feature(track_caller)]
2019-10-05T18:00:55.4067488Z 
2019-10-05T18:00:55.4067530Z error: aborting due to previous error
2019-10-05T18:00:55.4067559Z 
2019-10-05T18:00:55.4067559Z 
2019-10-05T18:00:55.4067620Z Some expected error codes were not found: ["E0738"]
2019-10-05T18:00:55.4067691Z failures:
2019-10-05T18:00:55.4068013Z     /checkout/obj/build/x86_64-unknown-linux-gnu/test/error-index.md - Rust_Compiler_Error_Index::E0738 (line 12390)
2019-10-05T18:00:55.4068053Z 
2019-10-05T18:00:55.4068222Z test result: FAILED. 716 passed; 1 failed; 25 ignored; 0 measured; 0 filtered out
---
2019-10-05T18:00:55.4068895Z == clock drift check ==
2019-10-05T18:00:55.4068956Z   local time: Sat Oct  5 18:00:55 UTC 2019
2019-10-05T18:00:55.4809622Z   network time: Sat, 05 Oct 2019 18:00:55 GMT
2019-10-05T18:00:55.4814918Z == end clock drift check ==
2019-10-05T18:00:56.3572537Z ##[error]Bash exited with code '1'.
2019-10-05T18:00:56.3619021Z ##[section]Starting: Checkout
2019-10-05T18:00:56.3621248Z ==============================================================================
2019-10-05T18:00:56.3621331Z Task         : Get sources
2019-10-05T18:00:56.3621385Z 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)

rust-highfive · 2019-10-06T00:43:31Z

The job mingw-check 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-10-06T00:31:36.9881678Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-10-06T00:31:37.0118604Z ##[command]git config gc.auto 0
2019-10-06T00:31:37.0202136Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-10-06T00:31:37.0273569Z ##[command]git config --get-all http.proxy
2019-10-06T00:31:37.0422394Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/65082/merge:refs/remotes/pull/65082/merge
---
2019-10-06T00:39:29.9609852Z     Checking syntax_pos v0.0.0 (/checkout/src/libsyntax_pos)
2019-10-06T00:39:31.4397033Z     Checking rustc_errors v0.0.0 (/checkout/src/librustc_errors)
2019-10-06T00:39:32.6915192Z     Checking fmt_macros v0.0.0 (/checkout/src/libfmt_macros)
2019-10-06T00:39:45.1769093Z     Checking syntax_ext v0.0.0 (/checkout/src/libsyntax_ext)
2019-10-06T00:39:48.7275906Z error[E0425]: cannot find value `is_reify_shim` in this scope
2019-10-06T00:39:48.7277443Z    --> src/librustc/ty/instance.rs:311:12
2019-10-06T00:39:48.7278419Z 311 |         if is_reify_shim {
2019-10-06T00:39:48.7279135Z     |            ^^^^^^^^^^^^^ not found in this scope
2019-10-06T00:39:48.7279379Z 
2019-10-06T00:40:09.9384321Z error: aborting due to previous error
---
2019-10-06T00:40:10.1237428Z == clock drift check ==
2019-10-06T00:40:10.1255978Z   local time: Sun Oct  6 00:40:10 UTC 2019
2019-10-06T00:40:10.2664912Z   network time: Sun, 06 Oct 2019 00:40:10 GMT
2019-10-06T00:40:10.2669930Z == end clock drift check ==
2019-10-06T00:40:11.0935435Z ##[error]Bash exited with code '1'.
2019-10-06T00:40:11.0967494Z ##[section]Starting: Checkout
2019-10-06T00:40:11.0969078Z ==============================================================================
2019-10-06T00:40:11.0969517Z Task         : Get sources
2019-10-06T00:40:11.0969573Z 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-10-07T03:48:16Z

☔ The latest upstream changes (presumably #64906) made this pull request unmergeable. Please resolve the merge conflicts.

anp · 2019-10-07T15:16:39Z

I had some fun with git history and opened a new PR: #65182

Add `Instance::resolve_for_fn_ptr` (RFC 2091 #2/N) Supercedes: #65082 Depends on: #65037 Tracking issue: #47809 [RFC text](https://github.com/rust-lang/rfcs/blob/master/text/2091-inline-semantic.md) steps taken: * [x] add a `ReifyShim` that is similar to `VirtualShim` in behavior (see #54183) * [x] add `ty::Instance::resolve_for_fn_ptr` (leave `ty::Instance::resolve_vtable` alone), migrate appropriate callers * [x] `resolve_for_fn_ptr` returns the shim if calling a `#[track_caller]` function

rust-highfive assigned matthewjasper Oct 4, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 4, 2019

anp mentioned this pull request Oct 4, 2019

Tracking issue for RFC 2091: Implicit caller location #47809

Closed

3 tasks

GuillaumeGomez requested changes Oct 4, 2019

View reviewed changes

src/librustc/error_codes.rs Show resolved Hide resolved

src/librustc/hir/check_attr.rs Show resolved Hide resolved

src/librustc_typeck/error_codes.rs Show resolved Hide resolved

src/librustc_typeck/error_codes.rs Show resolved Hide resolved

anp force-pushed the instance-resolve-indirect branch from d22bbc0 to 94e1c55 Compare October 4, 2019 21:28

ayosec and others added 13 commits October 5, 2019 08:52

track_caller run-pass test, lint cleanup, PR review.

6edbfdc

track_caller feature gate starts in 1.40.0.

43c1065

Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>

Mark #![feature(track_caller)] as incomplete.

635ded0

track_caller error numbers and text.

2e9400c

track_caller tests account for incomplete feature warning.

00df81c

E0735 -> E0739

db7af2b

Prevents number collision with another approved PR.

E073[6-8] include failing code examples.

532465b

Expand E0738 to cover different cases.

26ce8fe

Update expected error output.

11aece0

Prohibit #[track_caller] within trait impls as well as decls.

fbeaec6

Clarify variable names when checking track_caller methods.

0a87757

Add InstanceDef::ReifyShim for track_caller functions.

c352eda

anp force-pushed the instance-resolve-indirect branch from 94e1c55 to c352eda Compare October 5, 2019 16:03

Add Instance::resolve_for_fn_ptr

311fa06

anp mentioned this pull request Oct 7, 2019

Add Instance::resolve_for_fn_ptr (RFC 2091 #2/N) #65182

Merged

3 tasks

anp closed this Oct 7, 2019

anp deleted the instance-resolve-indirect branch October 7, 2019 15:16

Centril added the F-track_caller `#![feature(track_caller)]` label Oct 10, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WIP Add a shim for functions annotated with `#[track_caller]` (RFC 2091 #2/N) #65082

WIP Add a shim for functions annotated with `#[track_caller]` (RFC 2091 #2/N) #65082

anp commented Oct 4, 2019 •

edited

Loading

rust-highfive commented Oct 4, 2019

rust-highfive commented Oct 4, 2019

GuillaumeGomez left a comment

anp commented Oct 4, 2019

GuillaumeGomez commented Oct 4, 2019

rust-highfive commented Oct 4, 2019

rust-highfive commented Oct 5, 2019

rust-highfive commented Oct 6, 2019

bors commented Oct 7, 2019

anp commented Oct 7, 2019

WIP Add a shim for functions annotated with #[track_caller] (RFC 2091 #2/N) #65082

WIP Add a shim for functions annotated with #[track_caller] (RFC 2091 #2/N) #65082

Conversation

anp commented Oct 4, 2019 • edited Loading

rust-highfive commented Oct 4, 2019

rust-highfive commented Oct 4, 2019

GuillaumeGomez left a comment

Choose a reason for hiding this comment

anp commented Oct 4, 2019

GuillaumeGomez commented Oct 4, 2019

rust-highfive commented Oct 4, 2019

rust-highfive commented Oct 5, 2019

rust-highfive commented Oct 6, 2019

bors commented Oct 7, 2019

anp commented Oct 7, 2019

WIP Add a shim for functions annotated with `#[track_caller]` (RFC 2091 #2/N) #65082

WIP Add a shim for functions annotated with `#[track_caller]` (RFC 2091 #2/N) #65082

anp commented Oct 4, 2019 •

edited

Loading