[MIR] Initial implementation for translating calls. #30364

luqmana · 2015-12-13T13:52:21Z

rust-highfive · 2015-12-13T13:52:25Z

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

nagisa · 2015-12-13T21:01:39Z

src/librustc_trans/trans/mir/constant.rs

@@ -49,8 +68,11 @@ impl<'bcx, 'tcx> MirContext<'bcx, 'tcx> {
    {
        let constant_ty = bcx.monomorphize(&constant.ty);
        match constant.literal {
-            mir::Literal::Item { .. } => {
-                unimplemented!()
+            mir::Literal::Item { def_id, substs } => {


Wait until #29907 is landed?

Yea sure, ended up seeing it later and it's definitely nicer and more complete. I'll rebase on top of that instead.

nikomatsakis · 2015-12-14T23:45:58Z

r? @nikomatsakis

nikomatsakis · 2015-12-14T23:47:13Z

src/test/run-pass/mir_trans_calls.rs

+fn test2(a: isize) -> isize {
+    // Test passing a single argument.
+    // Not using out pointer.
+    fn callee(a: isize) -> isize {


can you add some tests using trait dispatch? (or does that not work yet)

Added some more tests for calling methods in different ways. #29907 + this pull also allow calling trait static methods which i've also included a test for.

bors · 2015-12-18T03:08:31Z

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

nikomatsakis · 2015-12-18T09:29:56Z

So #29907 has landed. I see that this PR was rebased, presumably to account for that?

nikomatsakis · 2015-12-18T09:31:55Z

@bors r+

Thanks @luqmana! Exciting. This is a big hurdle.

bors · 2015-12-18T09:31:55Z

📌 Commit fefe4e8 has been approved by nikomatsakis

bors · 2015-12-18T14:11:43Z

⌛ Testing commit fefe4e8 with merge b784e6c...

bors · 2015-12-18T15:17:28Z

💔 Test failed - auto-win-msvc-64-opt

dotdash · 2015-12-18T16:18:16Z

@luqmana That failure on windows is legit. The call to callee in test1 moves the Box, but still drops it. Valgrind also complains about that on linux.

==9625==    at 0x148878: je_valgrind_freelike_block (valgrind.c:33)
==9625==    by 0x10CE9F: heap::deallocate::ha08705e845151bb14ea (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x10CE44: heap::exchange_free::h2c2ccc188aeabd2akga (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x10CE11: Box$LT$i32$GT$::drop.3501::h2325578bde125039 (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x10CD31: test1::h2cd52b4aff680550eaa (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x10D219: main::h31e20355ce7fed41xda (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x115704: sys_common::unwind::try::try_fn::h7505552440393768204 (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x1132E8: __rust_try (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x1153A6: rt::lang_start::h347da8ae9f69d42864x (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x10F659: main (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==  Address 0x6021048 is 0 bytes inside a block of size 8 free'd
==9625==    at 0x148878: je_valgrind_freelike_block (valgrind.c:33)
==9625==    by 0x10CE9F: heap::deallocate::ha08705e845151bb14ea (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x10CE44: heap::exchange_free::h2c2ccc188aeabd2akga (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x10CE11: Box$LT$i32$GT$::drop.3501::h2325578bde125039 (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x10CD27: test1::h2cd52b4aff680550eaa (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x10D219: main::h31e20355ce7fed41xda (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x115704: sys_common::unwind::try::try_fn::h7505552440393768204 (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x1132E8: __rust_try (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x1153A6: rt::lang_start::h347da8ae9f69d42864x (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x10F659: main (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==  Block was alloc'd at
==9625==    at 0x11FBD3: je_mallocx (jemalloc.c:1560)
==9625==    by 0x10E4CF: heap::allocate::habdc17f0007099bfPda (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x10E442: heap::exchange_malloc::h8c52e41374611846Jfa (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x10D1DB: main::h31e20355ce7fed41xda (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x115704: sys_common::unwind::try::try_fn::h7505552440393768204 (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x1132E8: __rust_try (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x1153A6: rt::lang_start::h347da8ae9f69d42864x (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x10F659: main (in /home/doener/src/rust-origin/mir_trans_calls)
==9625== 
==9625== Invalid read of size 4
==9625==    at 0x10E64F: cmp::impls::i32.PartialEq::eq::h6dd47283b5ba64938fA (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x10E632: boxed::Box$LT$T$GT$.PartialEq::eq::eq::h15679945919347397840 (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x10E589: tuple::_$LP$A$C$$u20$B$C$$u20$C$RP$.PartialEq::eq::eq::h13937896417118323772 (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x10D3FD: main::h31e20355ce7fed41xda (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x115704: sys_common::unwind::try::try_fn::h7505552440393768204 (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x1132E8: __rust_try (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x1153A6: rt::lang_start::h347da8ae9f69d42864x (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x10F659: main (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==  Address 0x6021048 is 0 bytes inside a block of size 8 free'd
==9625==    at 0x148878: je_valgrind_freelike_block (valgrind.c:33)
==9625==    by 0x10CE9F: heap::deallocate::ha08705e845151bb14ea (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x10CE44: heap::exchange_free::h2c2ccc188aeabd2akga (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x10CE11: Box$LT$i32$GT$::drop.3501::h2325578bde125039 (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x10CD27: test1::h2cd52b4aff680550eaa (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x10D219: main::h31e20355ce7fed41xda (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x115704: sys_common::unwind::try::try_fn::h7505552440393768204 (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x1132E8: __rust_try (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x1153A6: rt::lang_start::h347da8ae9f69d42864x (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x10F659: main (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==  Block was alloc'd at
==9625==    at 0x11FBD3: je_mallocx (jemalloc.c:1560)
==9625==    by 0x10E4CF: heap::allocate::habdc17f0007099bfPda (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x10E442: heap::exchange_malloc::h8c52e41374611846Jfa (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x10D1DB: main::h31e20355ce7fed41xda (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x115704: sys_common::unwind::try::try_fn::h7505552440393768204 (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x1132E8: __rust_try (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x1153A6: rt::lang_start::h347da8ae9f69d42864x (in /home/doener/src/rust-origin/mir_trans_calls)
==9625==    by 0x10F659: main (in /home/doener/src/rust-origin/mir_trans_calls)

nagisa · 2015-12-18T16:19:24Z

See #29855

dotdash · 2015-12-18T16:22:07Z

As @nagisa said on IRC, I think it's fine to just remove the Box argument for now to make the test work.

nikomatsakis · 2015-12-18T16:26:41Z

On Fri, Dec 18, 2015 at 08:20:02AM -0800, Simonas Kazlauskas wrote:

See #29855

Oh yeah, we probably want to modify trans to zero. Bah. Forgot about
that!

luqmana · 2015-12-18T22:40:16Z

@bors: r=nikomatsakis

Just removed Box from the test for now til we get drop working.

bors · 2015-12-18T22:40:17Z

📌 Commit a6b861b has been approved by nikomatsakis

bors · 2015-12-18T23:06:25Z

⌛ Testing commit a6b861b with merge 9e27895...

bors · 2015-12-19T00:57:21Z

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-opt

bors · 2015-12-19T00:57:29Z

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-opt

rust-highfive assigned jroesch Dec 13, 2015

nagisa reviewed Dec 13, 2015
View reviewed changes

nikomatsakis assigned nikomatsakis and unassigned jroesch Dec 14, 2015

nikomatsakis reviewed Dec 14, 2015
View reviewed changes

luqmana force-pushed the mir-calls branch from d825b92 to 75eb3b7 Compare December 15, 2015 11:24

luqmana force-pushed the mir-calls branch from 75eb3b7 to fefe4e8 Compare December 18, 2015 03:51

[MIR] Initial implementation for translating calls.

a6b861b

luqmana force-pushed the mir-calls branch from fefe4e8 to a6b861b Compare December 18, 2015 22:33

bors added a commit that referenced this pull request Dec 18, 2015

Auto merge of #30364 - luqmana:mir-calls, r=nikomatsakis

9e27895

bors merged commit a6b861b into rust-lang:master Dec 19, 2015

luqmana deleted the mir-calls branch December 19, 2015 05:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[MIR] Initial implementation for translating calls. #30364

[MIR] Initial implementation for translating calls. #30364

luqmana commented Dec 13, 2015

rust-highfive commented Dec 13, 2015

nagisa Dec 13, 2015

luqmana Dec 14, 2015

nikomatsakis commented Dec 14, 2015

nikomatsakis Dec 14, 2015

luqmana Dec 15, 2015

bors commented Dec 18, 2015

nikomatsakis commented Dec 18, 2015

nikomatsakis commented Dec 18, 2015

bors commented Dec 18, 2015

bors commented Dec 18, 2015

bors commented Dec 18, 2015

dotdash commented Dec 18, 2015

nagisa commented Dec 18, 2015

dotdash commented Dec 18, 2015

nikomatsakis commented Dec 18, 2015

luqmana commented Dec 18, 2015

bors commented Dec 18, 2015

bors commented Dec 18, 2015

bors commented Dec 19, 2015

bors commented Dec 19, 2015

[MIR] Initial implementation for translating calls. #30364

[MIR] Initial implementation for translating calls. #30364

Conversation

luqmana commented Dec 13, 2015

rust-highfive commented Dec 13, 2015

nagisa Dec 13, 2015

Choose a reason for hiding this comment

luqmana Dec 14, 2015

Choose a reason for hiding this comment

nikomatsakis commented Dec 14, 2015

nikomatsakis Dec 14, 2015

Choose a reason for hiding this comment

luqmana Dec 15, 2015

Choose a reason for hiding this comment

bors commented Dec 18, 2015

nikomatsakis commented Dec 18, 2015

nikomatsakis commented Dec 18, 2015

bors commented Dec 18, 2015

bors commented Dec 18, 2015

bors commented Dec 18, 2015

dotdash commented Dec 18, 2015

nagisa commented Dec 18, 2015

dotdash commented Dec 18, 2015

nikomatsakis commented Dec 18, 2015

luqmana commented Dec 18, 2015

bors commented Dec 18, 2015

bors commented Dec 18, 2015

bors commented Dec 19, 2015

bors commented Dec 19, 2015