diff options
| author | Thomas Lively <tlively@google.com> | 2023-11-16 19:56:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-16 10:56:25 -0800 |
| commit | 5241d8796c2cf42dca45ebf53d5aea00d8a555d8 (patch) | |
| tree | 204bdf8cba3c9c926b0447b07152aca2d6c72cfa /src/passes/Outlining.cpp | |
| parent | 0e37557d779147375655c0bb46838709ba459091 (diff) | |
| download | binaryen-5241d8796c2cf42dca45ebf53d5aea00d8a555d8.tar.gz binaryen-5241d8796c2cf42dca45ebf53d5aea00d8a555d8.tar.bz2 binaryen-5241d8796c2cf42dca45ebf53d5aea00d8a555d8.zip | |
Update IRBuilder to visit control flow correctly (#6124)
Besides If, no control flow structure consumes values from the stack. Fix a
bug in IRBuilder that was causing it to pop control flow children. Also fix a
follow on bug in outlining where it did not make the If condition available on
the stack when starting to visit an If. This required making push() part of
the public API of IRBuilder.
As a drive-by, also add helpful debug logging to IRBuilder.
Co-authored-by: Ashley Nelson <nashley@google.com>
Diffstat (limited to 'src/passes/Outlining.cpp')
| -rw-r--r-- | src/passes/Outlining.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/passes/Outlining.cpp b/src/passes/Outlining.cpp index c7644c339..f799d2c7a 100644 --- a/src/passes/Outlining.cpp +++ b/src/passes/Outlining.cpp @@ -93,6 +93,11 @@ struct ReconstructStringifyWalker ASSERT_OK(existingBuilder.visitBlockStart(curr->block)); DBG(desc = "Block Start for "); } else if (auto curr = reason.getIfStart()) { + // IR builder needs the condition of the If pushed onto the builder before + // visitIfStart(), which will expect to be able to pop the condition. + // This is always okay to do because the correct condition was installed + // onto the If when the outer scope was visited. + existingBuilder.push(curr->iff->condition); ASSERT_OK(existingBuilder.visitIfStart(curr->iff)); DBG(desc = "If Start for "); } else if (reason.getEnd()) { |