Skip to content

Fix #339: ChaiScript assumes a non-const object reference is an R-value (&&) #685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leftibot wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix #339: ChaiScript assumes a non-const object reference is an R-value (&&) #685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions include/chaiscript/dispatchkit/boxed_cast_helper.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,9 @@ namespace chaiscript {
template<typename Result>
struct Cast_Helper_Inner<Result &&> {
static Result &&cast(const Boxed_Value &ob, const Type_Conversions_State *) {
if (ob.is_ref()) {
throw chaiscript::detail::exception::bad_any_cast();
}
return std::move(*static_cast<Result *>(verify_type(ob, typeid(Result), ob.get_ptr())));
}
};
Expand Down
76 changes: 76 additions & 0 deletions unittests/compiled_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1970,3 +1970,79 @@ TEST_CASE("Exception from C++ [] operator is catchable in ChaiScript") {
caught
)") == true);
}

class Issue339_Object {
public:
Issue339_Object() = default;
Issue339_Object(const Issue339_Object &) { ++copy_count(); }
Issue339_Object(Issue339_Object &&) { ++move_count(); }
Issue339_Object &operator=(const Issue339_Object &) {
++copy_assign_count();
return *this;
}
Issue339_Object &operator=(Issue339_Object &&) {
++move_assign_count();
return *this;
}

static int &copy_count() {
static int c = 0;
return c;
}
static int &move_count() {
static int c = 0;
return c;
}
static int &copy_assign_count() {
static int c = 0;
return c;
}
static int &move_assign_count() {
static int c = 0;
return c;
}
static void reset_counts() {
copy_count() = 0;
move_count() = 0;
copy_assign_count() = 0;
move_assign_count() = 0;
}
};

TEST_CASE("Issue #339 - lvalue reference should not implicitly move") {
chaiscript::ChaiScript_Basic chai(create_chaiscript_stdlib(), create_chaiscript_parser());

auto m = std::make_shared<chaiscript::Module>();
m->add(chaiscript::user_type<Issue339_Object>(), "Obj");
m->add(chaiscript::constructor<Issue339_Object()>(), "Obj");
m->add(chaiscript::constructor<Issue339_Object(const Issue339_Object &)>(), "Obj");
m->add(chaiscript::constructor<Issue339_Object(Issue339_Object &&)>(), "Obj");
m->add(chaiscript::fun(static_cast<Issue339_Object &(Issue339_Object::*)(const Issue339_Object &)>(&Issue339_Object::operator=)), "=");
m->add(chaiscript::fun(static_cast<Issue339_Object &(Issue339_Object::*)(Issue339_Object &&)>(&Issue339_Object::operator=)), "=");
m->add(chaiscript::fun([]() -> Issue339_Object & {
static Issue339_Object persistent;
return persistent;
}),
"getObj");
m->add(chaiscript::fun([]() -> Issue339_Object { return Issue339_Object(); }), "makeObj");
chai.add(m);

SECTION("var from lvalue ref uses copy ctor, not move ctor on the source") {
Issue339_Object::reset_counts();
chai.eval("var o = getObj()");
CHECK(Issue339_Object::copy_count() >= 1);
}

SECTION("assignment from lvalue ref uses copy assign, not move assign") {
Issue339_Object::reset_counts();
chai.eval("var o2 = Obj(); o2 = getObj()");
CHECK(Issue339_Object::copy_assign_count() > 0);
CHECK(Issue339_Object::move_assign_count() == 0);
}

SECTION("return-by-value can still use move") {
Issue339_Object::reset_counts();
chai.eval("var o3 = makeObj()");
CHECK((Issue339_Object::copy_count() + Issue339_Object::move_count()) >= 1);
}
}
Loading