Skip to content

Fix ExceptionPackage memory errors #3088

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

Merged
tlively merged 3 commits into from
Sep 1, 2020
Merged

Fix ExceptionPackage memory errors #3088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6fa0f3
Fix ExceptionPackage memory errors
tlively Sep 1, 2020
79543b0
Remove unnecessary std::move
tlively Sep 1, 2020
f2de32e
Move logic from assignment operator to constructor
tlively Sep 1, 2020
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
5 changes: 1 addition & 4 deletions src/literal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,7 @@ class Literal {
assert(type == Type::funcref);
return func;
}
const ExceptionPackage& getExceptionPackage() const {
assert(type == Type::exnref);
return *exn.get();
}
ExceptionPackage getExceptionPackage() const;
Copy link
Member

@kripken kripken Sep 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why move this body to the cpp? all the siblings are here it seems.

Copy link
Member Author

@tlively tlively Sep 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since ExceptionPackage is now returned by value, it needs to be a complete type at the point of this function definition. But the definition of ExceptionPackage can't move before the definition of Literal for the same reason, so the only choice was to move getExceptionPackage to be defined out of line, which means it needs to be in the .cpp file.

Copy link
Member

@kripken kripken Sep 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, thanks...


// careful!
int32_t* geti32Ptr() {
Expand Down
2 changes: 1 addition & 1 deletion src/wasm-interpreter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1297,7 +1297,7 @@ class ExpressionRunner : public OverriddenVisitor<SubType, Flow> {
if (flow.getType() == Type::nullref) {
trap("br_on_exn: argument is null");
}
const ExceptionPackage& ex = flow.getSingleValue().getExceptionPackage();
auto ex = flow.getSingleValue().getExceptionPackage();
if (curr->event != ex.event) { // Not taken
return flow;
}
Expand Down
18 changes: 14 additions & 4 deletions src/wasm/literal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,7 @@ Literal::Literal(const uint8_t init[16]) : type(Type::v128) {
memcpy(&v128, init, 16);
}

Literal::Literal(const Literal& other) { *this = other; }

Literal& Literal::operator=(const Literal& other) {
type = other.type;
Literal::Literal(const Literal& other) : type(other.type) {
TODO_SINGLE_COMPOUND(type);
switch (type.getBasic()) {
case Type::i32:
Expand All @@ -54,6 +51,7 @@ Literal& Literal::operator=(const Literal& other) {
func = other.func;
break;
case Type::exnref:
// Avoid calling the destructor on an uninitialized value
new (&exn) auto(std::make_unique<ExceptionPackage>(*other.exn));
break;
case Type::none:
Expand All @@ -63,6 +61,13 @@ Literal& Literal::operator=(const Literal& other) {
case Type::unreachable:
WASM_UNREACHABLE("unexpected type");
}
}

Literal& Literal::operator=(const Literal& other) {
if (this != &other) {
this->~Literal();
new (this) auto(other);
}
return *this;
}

Expand Down Expand Up @@ -124,6 +129,11 @@ std::array<uint8_t, 16> Literal::getv128() const {
return ret;
}

ExceptionPackage Literal::getExceptionPackage() const {
assert(type == Type::exnref);
return *exn.get();
}

Literal Literal::castToF32() {
assert(type == Type::i32);
Literal ret(i32);
Expand Down