T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always insert the entry EBB before translating any WASM.

Browse Source 
The FuncEnvironment callbacks (make_global in particular) may need to
insert code in the entry EBB. We need to make sure the entry EBB has
been inserted in the layout before making those callbacks.
This commit is contained in:
Jakob Stoklund Olesen
2017-09-18 11:53:32 -07:00
parent f5f37ac4a6
commit da4cde8117
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/frontend/src/frontend.rs
View File

@@ -373,7 +373,7 @@ where
} }
/// Make sure that the current EBB is inserted in the layout. /// Make sure that the current EBB is inserted in the layout.
fn ensure_inserted_ebb(&mut self) { pub fn ensure_inserted_ebb(&mut self) {
let ebb = self.position.ebb; let ebb = self.position.ebb;
if self.builder.ebbs[ebb].pristine { if self.builder.ebbs[ebb].pristine {
if !self.func.layout.is_ebb_inserted(ebb) { if !self.func.layout.is_ebb_inserted(ebb) {

4
lib/wasm/src/func_translator.rs
View File

@@ -84,6 +84,10 @@ impl FuncTranslator {
let entry_block = builder.create_ebb(); let entry_block = builder.create_ebb();
builder.switch_to_block(entry_block, &[]); // This also creates values for the arguments. builder.switch_to_block(entry_block, &[]); // This also creates values for the arguments.
builder.seal_block(entry_block); builder.seal_block(entry_block);
// Make sure the entry block is inserted in the layout before we make any callbacks to
// `environ`. The callback functions may need to insert things in the entry block.
builder.ensure_inserted_ebb();
let num_args = declare_wasm_arguments(builder); let num_args = declare_wasm_arguments(builder);
// Set up the translation state with a single pushed control block representing the whole // Set up the translation state with a single pushed control block representing the whole