Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions cpp2rust/converter/converter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5795,17 +5795,30 @@ std::string Converter::GetMappedAsString(clang::Expr *expr, clang::Expr **args,
ReturnsPointerToArg(all_args[base->n])) {
bind[base->n] = true;
}

auto first = ArgsToEvaluateFirst(expr, *tgt_ir, all_args, bind);
// Construction happens inside the C++ call, after its fixed operands.
// Plan fixed-operand bindings before checking for conflicting init borrows.
auto num_params = std::min(tgt_ir->params.size(), all_args.size());
bool always_constructs_init = tgt_ir->alwaysConstructsInit();
auto init_bind = bind;
if (always_constructs_init && HasReceiver(expr)) {
for (size_t i = 0; i < num_params; ++i) {
init_bind[i] = init_bind[i] || all_args[i]->HasSideEffects(ctx_);
}
}
auto first = ArgsToEvaluateFirst(expr, *tgt_ir, all_args, init_bind);
// The object that init constructs is constructed first, rather than its
// arguments evaluated first one by one, and once if the body uses it more
// than once.
auto num_params = std::min(tgt_ir->params.size(), all_args.size());
bool init_first =
tgt_ir->alwaysConstructsInit() &&
always_constructs_init &&
(tgt_ir->initCopies() > 1 ||
std::find(first.begin() + num_params, first.end(), true) != first.end());

if (init_first) {
bind = std::move(init_bind);
} else if (init_bind != bind) {
// A declined plan must not hide bindings needed by the original borrows.
first = ArgsToEvaluateFirst(expr, *tgt_ir, all_args, bind);
}
std::vector<std::string> values, names;
bool all_by_value = true;

Expand Down
30 changes: 30 additions & 0 deletions tests/unit/emplace_hint_receiver_order.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// ADDITIONAL_COMPILE_FLAGS: -std=c++17

#include <cstdio>
#include <map>
#include <vector>
using Map = std::map<int, std::vector<int>>;
Map *receiver(Map *m, std::vector<int> *v, int *calls) {
++*calls;
(*v)[2] = 9;
return m;
}
Map::iterator hint(Map *m, std::vector<int> *v, int *calls) {
++*calls;
(*v)[2] = 7;
return m->end();
}
int main() {
for (int select_receiver = 1; select_receiver >= 0; --select_receiver) {
Map m;
std::vector<int> v{1, 2, 3};
int a = 0, b = 0;
if (select_receiver)
receiver(&m, &v, &a)->emplace_hint(hint(&m, &v, &b), 1, v);
else
m.emplace_hint(hint(&m, &v, &b), 1, v);
const std::vector<int> &inserted = m.at(1);
std::printf("receiver=%d hint=%d source=%d inserted=%d\n", a, b, v[2],
inserted[2]);
}
}
21 changes: 21 additions & 0 deletions tests/unit/emplace_receiver_alias.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// ADDITIONAL_COMPILE_FLAGS: -std=c++14

#include <cstdio>
#include <vector>

using Rows = std::vector<std::vector<int>>;

Rows *select_rows(Rows *rows, int *calls) {
++*calls;
return rows;
}

int main() {
Rows rows{{1, 2, 3}};
rows.reserve(2);
int calls = 0;
Rows *alias = &rows;
select_rows(alias, &calls)
->emplace_back((*alias)[0].data(), (*alias)[0].data() + 3);
std::printf("calls=%d size=%zu last=%d\n", calls, rows.size(), rows[1][2]);
}
29 changes: 29 additions & 0 deletions tests/unit/emplace_receiver_order.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// ADDITIONAL_COMPILE_FLAGS: -std=c++14

#include <cstdio>
#include <vector>

using Rows = std::vector<std::vector<int>>;

Rows *select_rows(Rows *rows, int *calls) {
++*calls;
(*rows)[0][2] = 9;
return rows;
}

int main() {
for (int bound = 0; bound < 2; ++bound) {
Rows rows{{1, 2, 3}};
rows.reserve(2);
int calls = 0;
if (bound) {
Rows *receiver = select_rows(&rows, &calls);
receiver->emplace_back(rows[0].data(), rows[0].data() + 3);
} else {
select_rows(&rows, &calls)
->emplace_back(rows[0].data(), rows[0].data() + 3);
}
std::printf("source=%d inserted=%d calls=%d\n", rows[0][2], rows[1][2],
calls);
}
}
100 changes: 100 additions & 0 deletions tests/unit/out/refcount/emplace_hint_receiver_order.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
extern crate libcc2rs;
use libcc2rs::*;
use std::cell::RefCell;
use std::collections::BTreeMap;
use std::io::prelude::*;
use std::io::{Read, Seek, Write};
use std::os::fd::AsFd;
use std::rc::{Rc, Weak};
pub fn receiver_0(
mut m: Ptr<Map<i32, (Value<i32>, Value<Vec<i32>>)>>,
mut v: Ptr<Vec<i32>>,
mut calls: Ptr<i32>,
) -> Ptr<Map<i32, (Value<i32>, Value<Vec<i32>>)>> {
calls.with_mut(|__v| {
__v.prefix_inc();
});
index!(v, 2_usize).write(9);
return m;
}
pub fn hint_1(
mut m: Ptr<Map<i32, (Value<i32>, Value<Vec<i32>>)>>,
mut v: Ptr<Vec<i32>>,
mut calls: Ptr<i32>,
) -> BidirectionalIterator<(Value<i32>, Value<Vec<i32>>)> {
calls.with_mut(|__v| {
__v.prefix_inc();
});
index!(v, 2_usize).write(7);
return m.with(|__m: &Map<i32, (Value<i32>, Value<Vec<i32>>)>| __m.end());
}
pub fn main() {
__cpp2rust_init_globals();
libcc2rs::cpp2rust_exit(main_0());
}
fn main_0() -> i32 {
{
let mut select_receiver: i32 = 1;
'loop_: while (select_receiver >= 0) {
let m: Value<Map<i32, (Value<i32>, Value<Vec<i32>>)>> =
Rc::new(RefCell::new(Map::new()));
let v: Value<Vec<i32>> = Rc::new(RefCell::new(Vec::from([1, 2, 3])));
let a: Value<i32> = Rc::new(RefCell::new(0));
let b: Value<i32> = Rc::new(RefCell::new(0));
if (select_receiver != 0) {
{
let mut __tmp_0 =
{ ({ receiver_0((m.as_pointer()), (v.as_pointer()), (a.as_pointer())) }) };
let mut __tmp_1 = {
<BidirectionalIterator<(Value<i32>, Value<Vec<i32>>)>>::from(
({ hint_1((m.as_pointer()), (v.as_pointer()), (b.as_pointer())) }),
)
};
let mut __tmp_2 = {
(
Rc::new(RefCell::new(1)),
Rc::new(RefCell::new(({ (*v.borrow()).clone() }))),
)
};
let _ = (__tmp_1).clone();
Map::emplace((__tmp_0).clone(), &__tmp_2.0.as_pointer(), || __tmp_2).0
};
} else {
{
let mut __tmp_3 = {
<BidirectionalIterator<(Value<i32>, Value<Vec<i32>>)>>::from(
({ hint_1((m.as_pointer()), (v.as_pointer()), (b.as_pointer())) }),
)
};
let mut __tmp_4 = {
(
Rc::new(RefCell::new(1)),
Rc::new(RefCell::new(({ (*v.borrow()).clone() }))),
)
};
let _ = (__tmp_3).clone();
Map::emplace(m.as_pointer(), &__tmp_4.0.as_pointer(), || __tmp_4).0
};
}
let inserted: Ptr<Vec<i32>> = ({
let __tmp_5: Value<i32> = Rc::new(RefCell::new(1));
(*m.borrow())
.get(&__tmp_5.as_pointer())
.expect("out of range!")
.borrow()
.1
.as_pointer()
});
printf!(
b"receiver=%d hint=%d source=%d inserted=%d\n",
(*a.borrow()),
(*b.borrow()),
{ (*v.borrow())[2_usize] },
(index!(inserted, 2_usize).read())
);
select_receiver.prefix_dec();
}
}
0
}
pub fn __cpp2rust_init_globals() {}
54 changes: 54 additions & 0 deletions tests/unit/out/refcount/emplace_receiver_alias.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
extern crate libcc2rs;
use libcc2rs::*;
use std::cell::RefCell;
use std::collections::BTreeMap;
use std::io::prelude::*;
use std::io::{Read, Seek, Write};
use std::os::fd::AsFd;
use std::rc::{Rc, Weak};
pub fn select_rows_0(mut rows: Ptr<Vec<Vec<i32>>>, mut calls: Ptr<i32>) -> Ptr<Vec<Vec<i32>>> {
calls.with_mut(|__v| {
__v.prefix_inc();
});
return rows;
}
pub fn main() {
__cpp2rust_init_globals();
libcc2rs::cpp2rust_exit(main_0());
}
fn main_0() -> i32 {
let rows: Value<Vec<Vec<i32>>> = Rc::new(RefCell::new(Vec::from([Vec::from([1, 2, 3])])));
rows.with_mut(|__b0| {
if 2_usize > (*__b0).capacity() as usize {
let len_0 = (*__b0).len();
(*__b0).reserve_exact(2_usize - len_0 as usize);
}
});
let calls: Value<i32> = Rc::new(RefCell::new(0));
let mut alias: Ptr<Vec<Vec<i32>>> = (rows.as_pointer());
{
let mut __tmp_0 = { ({ select_rows_0((alias).clone(), (calls.as_pointer())) }) };
let mut __tmp_3 = {
{
let mut __tmp_1 = { (alias).decay().offset(0_usize).decay() };
let mut __tmp_2 = { (alias).decay().offset(0_usize).decay().offset((3) as isize) };
let mut __v = Vec::new();
let mut __it = (__tmp_1).clone();
while __it != __tmp_2 {
__v.push((__it.iter_deref().read()));
__it.iter_inc();
}
__v
}
};
__tmp_0.with_mut(|__v: &mut Vec<Vec<i32>>| __v.push(__tmp_3))
};
printf!(
b"calls=%d size=%zu last=%d\n",
(*calls.borrow()),
(*rows.borrow()).len(),
(index!(elem!(rows.decay(), 1_usize), 2_usize).read())
);
0
}
pub fn __cpp2rust_init_globals() {}
85 changes: 85 additions & 0 deletions tests/unit/out/refcount/emplace_receiver_order.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
extern crate libcc2rs;
use libcc2rs::*;
use std::cell::RefCell;
use std::collections::BTreeMap;
use std::io::prelude::*;
use std::io::{Read, Seek, Write};
use std::os::fd::AsFd;
use std::rc::{Rc, Weak};
pub fn select_rows_0(mut rows: Ptr<Vec<Vec<i32>>>, mut calls: Ptr<i32>) -> Ptr<Vec<Vec<i32>>> {
calls.with_mut(|__v| {
__v.prefix_inc();
});
index!(index!(rows, 0_usize), 2_usize).write(9);
return rows;
}
pub fn main() {
__cpp2rust_init_globals();
libcc2rs::cpp2rust_exit(main_0());
}
fn main_0() -> i32 {
{
let mut bound: i32 = 0;
'loop_: while (bound < 2) {
let rows: Value<Vec<Vec<i32>>> =
Rc::new(RefCell::new(Vec::from([Vec::from([1, 2, 3])])));
rows.with_mut(|__b0| {
if 2_usize > (*__b0).capacity() as usize {
let len_0 = (*__b0).len();
(*__b0).reserve_exact(2_usize - len_0 as usize);
}
});
let calls: Value<i32> = Rc::new(RefCell::new(0));
if (bound != 0) {
let mut receiver: Ptr<Vec<Vec<i32>>> =
({ select_rows_0((rows.as_pointer()), (calls.as_pointer())) });
{
let mut __tmp_2 = {
{
let mut __tmp_0 = { rows.decay().offset(0_usize).decay() };
let mut __tmp_1 =
{ rows.decay().offset(0_usize).decay().offset((3) as isize) };
let mut __v = Vec::new();
let mut __it = (__tmp_0).clone();
while __it != __tmp_1 {
__v.push((__it.iter_deref().read()));
__it.iter_inc();
}
__v
}
};
receiver.with_mut(|__v: &mut Vec<Vec<i32>>| __v.push(__tmp_2))
};
} else {
{
let mut __tmp_3 =
{ ({ select_rows_0((rows.as_pointer()), (calls.as_pointer())) }) };
let mut __tmp_6 = {
{
let mut __tmp_4 = { rows.decay().offset(0_usize).decay() };
let mut __tmp_5 =
{ rows.decay().offset(0_usize).decay().offset((3) as isize) };
let mut __v = Vec::new();
let mut __it = (__tmp_4).clone();
while __it != __tmp_5 {
__v.push((__it.iter_deref().read()));
__it.iter_inc();
}
__v
}
};
__tmp_3.with_mut(|__v: &mut Vec<Vec<i32>>| __v.push(__tmp_6))
};
}
printf!(
b"source=%d inserted=%d calls=%d\n",
(index!(elem!(rows.decay(), 0_usize), 2_usize).read()),
(index!(elem!(rows.decay(), 1_usize), 2_usize).read()),
(*calls.borrow())
);
bound.prefix_inc();
}
}
0
}
pub fn __cpp2rust_init_globals() {}
Loading
Loading