Skip to content
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

Remove intrusive_list (NFC) #2299

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Remove intrusive_list (NFC) #2299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32a110d
Replace intrusive_list<T> with std::list<std::unique_ptr<T>>
keithw Sep 16, 2023
435af28
Define ExprList as vector<unique_ptr<Expr>>
keithw Sep 19, 2023
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
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,6 @@ if (BUILD_TESTS)
set(UNITTESTS_SRCS
src/test-binary-reader.cc
src/test-interp.cc
src/test-intrusive-list.cc
src/test-literal.cc
src/test-option-parser.cc
src/test-filenames.cc
Expand Down
7 changes: 4 additions & 3 deletions include/wabt/decompiler-ast.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "wabt/ir-util.h"
#include "wabt/ir.h"

#include <iterator>
#include <map>

namespace wabt {
Expand Down Expand Up @@ -250,8 +251,8 @@ struct AST {
auto value_stack_in_variables = value_stack_depth;
bool unreachable = false;
for (auto& e : es) {
Construct(e);
auto arity = mc.GetExprArity(e);
Construct(*e);
auto arity = mc.GetExprArity(*e);
value_stack_depth -= arity.nargs;
value_stack_in_variables =
std::min(value_stack_in_variables, value_stack_depth);
Expand Down Expand Up @@ -337,7 +338,7 @@ struct AST {
// TODO: this would be nice to also do for local.get and maybe others,
// though that needs a way to ensure there's no local.set in between
// when they get lifted, so complicates matters a bit.
if (e.type() == ExprType::Const &&
if (e->type() == ExprType::Const &&
value_stack_in_variables == value_stack_depth - 1) {
value_stack_in_variables++;
}
Expand Down
Loading
Loading