[WIP] rustc_mir: use FnAbi to get abi::call::Conv in miri. by eddyb · Pull Request #66807 · rust-lang/rust

eddyb · 2019-11-27T11:39:56Z

Based on #65947.

I wanted to include this (i.e. only the last commit) in #65947, but I forgot that rustc_target::abi::call requires <Cx as LayoutOf>::TyLayout == TyLayout<Ty>, which works well enough for codegen (which ICEs on layout errors, since there's nothing else to do), but not miri.

I don't think this can land without a cleanup of the rustc_target::abi/rustc::ty::layout code to bake in Result (instead of doing all the MaybeResult dances), and either a lot of .unwrap() in codegen or maybe adding a get method (via extension trait?) to Result<T, !>.

r? @oli-obk cc @RalfJung

…ent::DerefMove.

…he MIR body.

…_mir.

…thods.

…FnAbi.

rust-highfive · 2019-11-27T11:59:54Z

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-11-27T11:40:40.7363390Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-11-27T11:40:40.7416272Z ##[command]git config gc.auto 0
2019-11-27T11:40:40.7419936Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-11-27T11:40:40.7423840Z ##[command]git config --get-all http.proxy
2019-11-27T11:40:40.7427960Z ##[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/66807/merge:refs/remotes/pull/66807/merge
---
2019-11-27T11:51:20.2832742Z    Compiling rustc_parse v0.0.0 (/checkout/src/librustc_parse)
2019-11-27T11:52:10.4667714Z    Compiling syntax_expand v0.0.0 (/checkout/src/libsyntax_expand)
2019-11-27T11:53:18.9252053Z    Compiling rustc_typeck v0.0.0 (/checkout/src/librustc_typeck)
2019-11-27T11:57:10.9657418Z    Compiling rustc_mir v0.0.0 (/checkout/src/librustc_mir)
2019-11-27T11:57:20.3542602Z error[E0271]: type mismatch resolving `<interpret::eval_context::InterpCx<'mir, 'tcx, M> as rustc_target::abi::LayoutOf>::TyLayout == rustc_target::abi::TyLayout<'_, &rustc::ty::TyS<'_>>`
2019-11-27T11:57:20.3544239Z   --> src/librustc_mir/interpret/terminator.rs:71:46
2019-11-27T11:57:20.3545118Z    |
2019-11-27T11:57:20.3550815Z 71 |                         (fn_val, caller_abi, FnAbi::of_fn_ptr(self, sig, &[]))
2019-11-27T11:57:20.3551777Z    |                                              ^^^^^^^^^^^^^^^^ expected struct `rustc_target::abi::TyLayout`, found enum `std::result::Result`
2019-11-27T11:57:20.3555820Z    |
2019-11-27T11:57:20.3557007Z    = note: expected type `rustc_target::abi::TyLayout<'_, &rustc::ty::TyS<'_>>`
2019-11-27T11:57:20.3557760Z               found type `std::result::Result<rustc_target::abi::TyLayout<'_, &rustc::ty::TyS<'_>>, rustc::mir::interpret::InterpErrorInfo<'_>>`
2019-11-27T11:57:20.3558438Z    = note: required by `rustc::ty::layout::FnAbiExt::of_fn_ptr`
2019-11-27T11:57:20.3561697Z 
2019-11-27T11:57:20.3610246Z error[E0277]: the trait bound `interpret::eval_context::InterpCx<'mir, 'tcx, M>: rustc_target::spec::HasTargetSpec` is not satisfied
2019-11-27T11:57:20.3610982Z   --> src/librustc_mir/interpret/terminator.rs:71:46
2019-11-27T11:57:20.3611584Z    |
2019-11-27T11:57:20.3612254Z 71 |                         (fn_val, caller_abi, FnAbi::of_fn_ptr(self, sig, &[]))
2019-11-27T11:57:20.3613279Z    |                                              ^^^^^^^^^^^^^^^^ the trait `rustc_target::spec::HasTargetSpec` is not implemented for `interpret::eval_context::InterpCx<'mir, 'tcx, M>`
2019-11-27T11:57:20.3613886Z    |
2019-11-27T11:57:20.3614465Z    = note: required by `rustc::ty::layout::FnAbiExt::of_fn_ptr`
2019-11-27T11:57:20.3618215Z 
2019-11-27T11:57:20.3732792Z error[E0271]: type mismatch resolving `<interpret::eval_context::InterpCx<'mir, 'tcx, M> as rustc_target::abi::LayoutOf>::TyLayout == rustc_target::abi::TyLayout<'_, &rustc::ty::TyS<'_>>`
2019-11-27T11:57:20.3734701Z   --> src/librustc_mir/interpret/terminator.rs:78:38
2019-11-27T11:57:20.3736792Z    |
2019-11-27T11:57:20.3738576Z 78 |                         let fn_abi = FnAbi::of_instance(self, instance, &[]);
2019-11-27T11:57:20.3740856Z    |                                      ^^^^^^^^^^^^^^^^^^ expected struct `rustc_target::abi::TyLayout`, found enum `std::result::Result`
2019-11-27T11:57:20.3741194Z    |
2019-11-27T11:57:20.3741514Z    = note: expected type `rustc_target::abi::TyLayout<'_, &rustc::ty::TyS<'_>>`
2019-11-27T11:57:20.3741875Z               found type `std::result::Result<rustc_target::abi::TyLayout<'_, &rustc::ty::TyS<'_>>, rustc::mir::interpret::InterpErrorInfo<'_>>`
2019-11-27T11:57:20.3742301Z    = note: required by `rustc::ty::layout::FnAbiExt::of_instance`
2019-11-27T11:57:20.3747882Z 
2019-11-27T11:57:20.3754888Z error[E0277]: the trait bound `interpret::eval_context::InterpCx<'mir, 'tcx, M>: rustc_target::spec::HasTargetSpec` is not satisfied
2019-11-27T11:57:20.3755220Z   --> src/librustc_mir/interpret/terminator.rs:78:38
2019-11-27T11:57:20.3755492Z    |
2019-11-27T11:57:20.3755826Z 78 |                         let fn_abi = FnAbi::of_instance(self, instance, &[]);
2019-11-27T11:57:20.3756721Z    |                                      ^^^^^^^^^^^^^^^^^^ the trait `rustc_target::spec::HasTargetSpec` is not implemented for `interpret::eval_context::InterpCx<'mir, 'tcx, M>`
2019-11-27T11:57:20.3757185Z    |
2019-11-27T11:57:20.3757501Z    = note: required by `rustc::ty::layout::FnAbiExt::of_instance`
2019-11-27T11:57:20.3762125Z 
2019-11-27T11:57:20.4363286Z error[E0271]: type mismatch resolving `<interpret::eval_context::InterpCx<'mir, 'tcx, M> as rustc_target::abi::LayoutOf>::TyLayout == rustc_target::abi::TyLayout<'_, &rustc::ty::TyS<'_>>`
2019-11-27T11:57:20.4363713Z    --> src/librustc_mir/interpret/terminator.rs:268:33
2019-11-27T11:57:20.4364035Z     |
2019-11-27T11:57:20.4364409Z 268 |             let callee_fn_abi = FnAbi::of_instance(self, instance, &[]);
2019-11-27T11:57:20.4364885Z     |                                 ^^^^^^^^^^^^^^^^^^ expected struct `rustc_target::abi::TyLayout`, found enum `std::result::Result`
2019-11-27T11:57:20.4365216Z     |
2019-11-27T11:57:20.4365606Z     = note: expected type `rustc_target::abi::TyLayout<'_, &rustc::ty::TyS<'_>>`
2019-11-27T11:57:20.4366430Z                found type `std::result::Result<rustc_target::abi::TyLayout<'_, &rustc::ty::TyS<'_>>, rustc::mir::interpret::InterpErrorInfo<'_>>`
2019-11-27T11:57:20.4366810Z     = note: required by `rustc::ty::layout::FnAbiExt::of_instance`
2019-11-27T11:57:20.4373082Z 
2019-11-27T11:57:20.4418874Z error[E0277]: the trait bound `interpret::eval_context::InterpCx<'mir, 'tcx, M>: rustc_target::spec::HasTargetSpec` is not satisfied
2019-11-27T11:57:20.4419259Z    --> src/librustc_mir/interpret/terminator.rs:268:33
2019-11-27T11:57:20.4419551Z     |
2019-11-27T11:57:20.4419958Z 268 |             let callee_fn_abi = FnAbi::of_instance(self, instance, &[]);
2019-11-27T11:57:20.4420488Z     |                                 ^^^^^^^^^^^^^^^^^^ the trait `rustc_target::spec::HasTargetSpec` is not implemented for `interpret::eval_context::InterpCx<'mir, 'tcx, M>`
2019-11-27T11:57:20.4420782Z     |
2019-11-27T11:57:20.4421125Z     = note: required by `rustc::ty::layout::FnAbiExt::of_instance`
2019-11-27T11:57:20.4421170Z 
2019-11-27T11:57:20.5180988Z error[E0271]: type mismatch resolving `<interpret::eval_context::InterpCx<'mir, 'tcx, M> as rustc_target::abi::LayoutOf>::TyLayout == rustc_target::abi::TyLayout<'_, &rustc::ty::TyS<'_>>`
2019-11-27T11:57:20.5181613Z    --> src/librustc_mir/interpret/terminator.rs:483:22
2019-11-27T11:57:20.5181981Z     |
2019-11-27T11:57:20.5182348Z 483 |         let fn_abi = FnAbi::of_instance(self, instance, &[]);
2019-11-27T11:57:20.5182814Z     |                      ^^^^^^^^^^^^^^^^^^ expected struct `rustc_target::abi::TyLayout`, found enum `std::result::Result`
2019-11-27T11:57:20.5183115Z     |
2019-11-27T11:57:20.5183506Z     = note: expected type `rustc_target::abi::TyLayout<'_, &rustc::ty::TyS<'_>>`
2019-11-27T11:57:20.5183979Z                found type `std::result::Result<rustc_target::abi::TyLayout<'_, &rustc::ty::TyS<'_>>, rustc::mir::interpret::InterpErrorInfo<'_>>`
2019-11-27T11:57:20.5184496Z     = note: required by `rustc::ty::layout::FnAbiExt::of_instance`
2019-11-27T11:57:20.5199990Z 
2019-11-27T11:57:20.5300130Z error[E0277]: the trait bound `interpret::eval_context::InterpCx<'mir, 'tcx, M>: rustc_target::spec::HasTargetSpec` is not satisfied
2019-11-27T11:57:20.5300517Z    --> src/librustc_mir/interpret/terminator.rs:483:22
2019-11-27T11:57:20.5300786Z     |
2019-11-27T11:57:20.5301167Z 483 |         let fn_abi = FnAbi::of_instance(self, instance, &[]);
2019-11-27T11:57:20.5301675Z     |                      ^^^^^^^^^^^^^^^^^^ the trait `rustc_target::spec::HasTargetSpec` is not implemented for `interpret::eval_context::InterpCx<'mir, 'tcx, M>`
2019-11-27T11:57:20.5301996Z     |
2019-11-27T11:57:20.5302353Z     = note: required by `rustc::ty::layout::FnAbiExt::of_instance`
2019-11-27T11:57:21.6766087Z error: aborting due to 8 previous errors
2019-11-27T11:57:21.6771108Z 
2019-11-27T11:57:21.6781589Z Some errors have detailed explanations: E0271, E0277.
2019-11-27T11:57:21.6792420Z For more information about an error, try `rustc --explain E0271`.
---
2019-11-27T11:59:46.5580380Z   local time: Wed Nov 27 11:59:46 UTC 2019
2019-11-27T11:59:46.7126253Z   network time: Wed, 27 Nov 2019 11:59:46 GMT
2019-11-27T11:59:46.7128480Z == end clock drift check ==
2019-11-27T11:59:49.6933836Z 
2019-11-27T11:59:49.7011119Z ##[error]Bash exited with code '1'.
2019-11-27T11:59:49.7061138Z ##[section]Starting: Checkout
2019-11-27T11:59:49.7062980Z ==============================================================================
2019-11-27T11:59:49.7063041Z Task         : Get sources
2019-11-27T11:59:49.7063094Z 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)

…rtual.

rust-highfive · 2019-11-27T12:30:10Z

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-11-27T12:10:01.6064391Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-11-27T12:10:01.6227981Z ##[command]git config gc.auto 0
2019-11-27T12:10:01.6304367Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-11-27T12:10:01.6367978Z ##[command]git config --get-all http.proxy
2019-11-27T12:10:01.6533390Z ##[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/66807/merge:refs/remotes/pull/66807/merge
---
2019-11-27T12:21:45.6626584Z    Compiling syntax_expand v0.0.0 (/checkout/src/libsyntax_expand)
2019-11-27T12:22:53.5432687Z    Compiling rustc_typeck v0.0.0 (/checkout/src/librustc_typeck)
2019-11-27T12:26:47.2271710Z    Compiling rustc_lint v0.0.0 (/checkout/src/librustc_lint)
2019-11-27T12:27:28.4973176Z    Compiling rustc_mir v0.0.0 (/checkout/src/librustc_mir)
2019-11-27T12:27:38.5632591Z error[E0271]: type mismatch resolving `<interpret::eval_context::InterpCx<'mir, 'tcx, M> as rustc_target::abi::LayoutOf>::TyLayout == rustc_target::abi::TyLayout<'_, &rustc::ty::TyS<'_>>`
2019-11-27T12:27:38.5634267Z   --> src/librustc_mir/interpret/terminator.rs:71:46
2019-11-27T12:27:38.5634867Z    |
2019-11-27T12:27:38.5635538Z 71 |                         (fn_val, caller_abi, FnAbi::of_fn_ptr(self, sig, &[]))
2019-11-27T12:27:38.5636353Z    |                                              ^^^^^^^^^^^^^^^^ expected struct `rustc_target::abi::TyLayout`, found enum `std::result::Result`
2019-11-27T12:27:38.5636909Z    |
2019-11-27T12:27:38.5637585Z    = note: expected type `rustc_target::abi::TyLayout<'_, &rustc::ty::TyS<'_>>`
2019-11-27T12:27:38.5638816Z               found type `std::result::Result<rustc_target::abi::TyLayout<'_, &rustc::ty::TyS<'_>>, rustc::mir::interpret::InterpErrorInfo<'_>>`
2019-11-27T12:27:38.5639620Z    = note: required by `rustc::ty::layout::FnAbiExt::of_fn_ptr`
2019-11-27T12:27:38.5644489Z 
2019-11-27T12:27:38.5775262Z error[E0277]: the trait bound `interpret::eval_context::InterpCx<'mir, 'tcx, M>: rustc_target::spec::HasTargetSpec` is not satisfied
2019-11-27T12:27:38.5775670Z   --> src/librustc_mir/interpret/terminator.rs:71:46
2019-11-27T12:27:38.5775916Z    |
2019-11-27T12:27:38.5776266Z 71 |                         (fn_val, caller_abi, FnAbi::of_fn_ptr(self, sig, &[]))
2019-11-27T12:27:38.5777015Z    |                                              ^^^^^^^^^^^^^^^^ the trait `rustc_target::spec::HasTargetSpec` is not implemented for `interpret::eval_context::InterpCx<'mir, 'tcx, M>`
2019-11-27T12:27:38.5777342Z    |
2019-11-27T12:27:38.5777685Z    = note: required by `rustc::ty::layout::FnAbiExt::of_fn_ptr`
2019-11-27T12:27:38.5847063Z 
2019-11-27T12:27:38.5849385Z error[E0271]: type mismatch resolving `<interpret::eval_context::InterpCx<'mir, 'tcx, M> as rustc_target::abi::LayoutOf>::TyLayout == rustc_target::abi::TyLayout<'_, &rustc::ty::TyS<'_>>`
2019-11-27T12:27:38.5849800Z   --> src/librustc_mir/interpret/terminator.rs:78:38
2019-11-27T12:27:38.5850090Z    |
2019-11-27T12:27:38.5850477Z 78 |                         let fn_abi = FnAbi::of_instance(self, instance, &[]);
2019-11-27T12:27:38.5850965Z    |                                      ^^^^^^^^^^^^^^^^^^ expected struct `rustc_target::abi::TyLayout`, found enum `std::result::Result`
2019-11-27T12:27:38.5851240Z    |
2019-11-27T12:27:38.5851876Z    = note: expected type `rustc_target::abi::TyLayout<'_, &rustc::ty::TyS<'_>>`
2019-11-27T12:27:38.5852334Z               found type `std::result::Result<rustc_target::abi::TyLayout<'_, &rustc::ty::TyS<'_>>, rustc::mir::interpret::InterpErrorInfo<'_>>`
2019-11-27T12:27:38.5852696Z    = note: required by `rustc::ty::layout::FnAbiExt::of_instance`
2019-11-27T12:27:38.5852761Z 
2019-11-27T12:27:38.5853155Z error[E0277]: the trait bound `interpret::eval_context::InterpCx<'mir, 'tcx, M>: rustc_target::spec::HasTargetSpec` is not satisfied
2019-11-27T12:27:38.5853492Z   --> src/librustc_mir/interpret/terminator.rs:78:38
2019-11-27T12:27:38.5853745Z    |
2019-11-27T12:27:38.5854098Z 78 |                         let fn_abi = FnAbi::of_instance(self, instance, &[]);
2019-11-27T12:27:38.5854619Z    |                                      ^^^^^^^^^^^^^^^^^^ the trait `rustc_target::spec::HasTargetSpec` is not implemented for `interpret::eval_context::InterpCx<'mir, 'tcx, M>`
2019-11-27T12:27:38.5854879Z    |
2019-11-27T12:27:38.5855226Z    = note: required by `rustc::ty::layout::FnAbiExt::of_instance`
2019-11-27T12:27:38.5855269Z 
2019-11-27T12:27:38.6310092Z error[E0271]: type mismatch resolving `<interpret::eval_context::InterpCx<'mir, 'tcx, M> as rustc_target::abi::LayoutOf>::TyLayout == rustc_target::abi::TyLayout<'_, &rustc::ty::TyS<'_>>`
2019-11-27T12:27:38.6310562Z    --> src/librustc_mir/interpret/terminator.rs:268:33
2019-11-27T12:27:38.6310854Z     |
2019-11-27T12:27:38.6311219Z 268 |             let callee_fn_abi = FnAbi::of_instance(self, instance, &[]);
2019-11-27T12:27:38.6311698Z     |                                 ^^^^^^^^^^^^^^^^^^ expected struct `rustc_target::abi::TyLayout`, found enum `std::result::Result`
2019-11-27T12:27:38.6311972Z     |
2019-11-27T12:27:38.6312577Z     = note: expected type `rustc_target::abi::TyLayout<'_, &rustc::ty::TyS<'_>>`
2019-11-27T12:27:38.6313075Z                found type `std::result::Result<rustc_target::abi::TyLayout<'_, &rustc::ty::TyS<'_>>, rustc::mir::interpret::InterpErrorInfo<'_>>`
2019-11-27T12:27:38.6313435Z     = note: required by `rustc::ty::layout::FnAbiExt::of_instance`
2019-11-27T12:27:38.6317623Z 
2019-11-27T12:27:38.6367399Z error[E0277]: the trait bound `interpret::eval_context::InterpCx<'mir, 'tcx, M>: rustc_target::spec::HasTargetSpec` is not satisfied
2019-11-27T12:27:38.6367766Z    --> src/librustc_mir/interpret/terminator.rs:268:33
2019-11-27T12:27:38.6368337Z     |
2019-11-27T12:27:38.6368726Z 268 |             let callee_fn_abi = FnAbi::of_instance(self, instance, &[]);
2019-11-27T12:27:38.6369244Z     |                                 ^^^^^^^^^^^^^^^^^^ the trait `rustc_target::spec::HasTargetSpec` is not implemented for `interpret::eval_context::InterpCx<'mir, 'tcx, M>`
2019-11-27T12:27:38.6369511Z     |
2019-11-27T12:27:38.6370060Z     = note: required by `rustc::ty::layout::FnAbiExt::of_instance`
2019-11-27T12:27:38.6373999Z 
2019-11-27T12:27:38.7279268Z error[E0271]: type mismatch resolving `<interpret::eval_context::InterpCx<'mir, 'tcx, M> as rustc_target::abi::LayoutOf>::TyLayout == rustc_target::abi::TyLayout<'_, &rustc::ty::TyS<'_>>`
2019-11-27T12:27:38.7279738Z    --> src/librustc_mir/interpret/terminator.rs:483:22
2019-11-27T12:27:38.7280046Z     |
2019-11-27T12:27:38.7295462Z 483 |         let fn_abi = FnAbi::of_instance(self, instance, &[]);
2019-11-27T12:27:38.7295979Z     |                      ^^^^^^^^^^^^^^^^^^ expected struct `rustc_target::abi::TyLayout`, found enum `std::result::Result`
2019-11-27T12:27:38.7296308Z     |
2019-11-27T12:27:38.7296684Z     = note: expected type `rustc_target::abi::TyLayout<'_, &rustc::ty::TyS<'_>>`
2019-11-27T12:27:38.7297139Z                found type `std::result::Result<rustc_target::abi::TyLayout<'_, &rustc::ty::TyS<'_>>, rustc::mir::interpret::InterpErrorInfo<'_>>`
2019-11-27T12:27:38.7297495Z     = note: required by `rustc::ty::layout::FnAbiExt::of_instance`
2019-11-27T12:27:38.7297603Z 
2019-11-27T12:27:38.7410532Z error[E0277]: the trait bound `interpret::eval_context::InterpCx<'mir, 'tcx, M>: rustc_target::spec::HasTargetSpec` is not satisfied
2019-11-27T12:27:38.7410962Z    --> src/librustc_mir/interpret/terminator.rs:483:22
2019-11-27T12:27:38.7411235Z     |
2019-11-27T12:27:38.7411663Z 483 |         let fn_abi = FnAbi::of_instance(self, instance, &[]);
2019-11-27T12:27:38.7412143Z     |                      ^^^^^^^^^^^^^^^^^^ the trait `rustc_target::spec::HasTargetSpec` is not implemented for `interpret::eval_context::InterpCx<'mir, 'tcx, M>`
2019-11-27T12:27:38.7412439Z     |
2019-11-27T12:27:38.7413007Z     = note: required by `rustc::ty::layout::FnAbiExt::of_instance`
2019-11-27T12:27:39.9758984Z error: aborting due to 8 previous errors
2019-11-27T12:27:39.9763207Z 
2019-11-27T12:27:39.9774910Z Some errors have detailed explanations: E0271, E0277.
2019-11-27T12:27:39.9785581Z For more information about an error, try `rustc --explain E0271`.
---
2019-11-27T12:29:48.8671152Z   local time: Wed Nov 27 12:29:48 UTC 2019
2019-11-27T12:29:49.1493446Z   network time: Wed, 27 Nov 2019 12:29:49 GMT
2019-11-27T12:29:49.1494491Z == end clock drift check ==
2019-11-27T12:29:52.0065713Z 
2019-11-27T12:29:52.0177927Z ##[error]Bash exited with code '1'.
2019-11-27T12:29:52.0212993Z ##[section]Starting: Checkout
2019-11-27T12:29:52.0215681Z ==============================================================================
2019-11-27T12:29:52.0215757Z Task         : Get sources
2019-11-27T12:29:52.0215805Z 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-02T11:45:59Z

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

JohnCSimon · 2019-12-07T07:33:44Z

Ping from triage
@eddyb - can you please address the merge conflicts and test failures?

eddyb · 2019-12-10T16:10:59Z

I have no plans to finish this right now, if anything changes I'll reopen later.

eddyb added 16 commits November 27, 2019 09:28

rustc: combine Instance::fn_sig_noadjust and Instance::fn_sig.

c2c4dc1

rustc_mir: don't hardcode InstanceDef::VtableShim behavior to Adjustm…

6159505

…ent::DerefMove.

rustc_codegen_ssa: use &'tcx mir::Body<'tcx> instead of &'a ... for t…

4e15e2e

…he MIR body.

rustc_codegen_ssa: make codegen_instance a simple wrapper for codegen…

473f908

…_mir.

rustc_codegen_ssa: clean up lifetimes on TerminatorCodegenHelper's me…

45e7c94

…thods.

rustc_codegen_ssa: remove define_fn and define_internal_fn.

6c8fb6e

rustc_codegen_ssa: take a FnAbi instead of a FnSig in declare_fn.

e370753

rustc_codegen_llvm: move NoReturn attribute to apply_attrs_llfn.

6de254d

rustc_codegen_ssa: use FnAbi::of_instance wherever possible.

d57c15f

rustc: use ReifyShim for reifying Virtual call instances.

6862a84

rustc: compute FnAbi's for virtual calls through FnAbi::of_instance.

880f905

rustc: rename FnAbi::new to FnAbi::of_fn_ptr.

49bed20

rustc: take a PolyFnSig instead of an FnSig in FnAbi::of_fn_ptr.

0e70c4d

rustc_codegen_llvm: rewrite debuginfo::get_function_signature to use …

8be241f

…FnAbi.

rustc_codegen_llvm: take an Instance in attributes::from_fn_attrs.

30edd33

rustc_codegen_llvm: privatize as much of attributes::* as possible.

5bdcde2

rust-highfive assigned oli-obk Nov 27, 2019

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

eddyb force-pushed the fn-abi-miri branch from 911979d to 530674b Compare November 27, 2019 12:01

eddyb added 4 commits November 27, 2019 14:09

rustc_target: add abi::call::Conv::Rust distinct from Conv::C.

4140720

rustc: move Instance::fn_sig to ty::layout and privatize it.

3315d70

rustc: add docs to FnAbi::{of_fn_ptr,of_instance} and InstanceDef::Vi…

0232114

…rtual.

[BROKEN] rustc_mir: use FnAbi to get abi::call::Conv in miri.

920dad9

eddyb force-pushed the fn-abi-miri branch from 530674b to 920dad9 Compare November 27, 2019 12:09

JohnCSimon added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 7, 2019

eddyb closed this Dec 10, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[WIP] rustc_mir: use FnAbi to get abi::call::Conv in miri.#66807

[WIP] rustc_mir: use FnAbi to get abi::call::Conv in miri.#66807
eddyb wants to merge 20 commits intorust-lang:masterfrom
eddyb:fn-abi-miri

eddyb commented Nov 27, 2019

Uh oh!

rust-highfive commented Nov 27, 2019

Uh oh!

rust-highfive commented Nov 27, 2019

Uh oh!

bors commented Dec 2, 2019

Uh oh!

JohnCSimon commented Dec 7, 2019

Uh oh!

eddyb commented Dec 10, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Conversation

eddyb commented Nov 27, 2019

Uh oh!

rust-highfive commented Nov 27, 2019

Uh oh!

rust-highfive commented Nov 27, 2019

Uh oh!

bors commented Dec 2, 2019

Uh oh!

JohnCSimon commented Dec 7, 2019

Uh oh!

eddyb commented Dec 10, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants