diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2016-01-07 14:09:12 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2016-01-07 14:09:12 -0800 |
| commit | 7d69ee4af775c4cd48e509c66330fa8ceecf4a24 (patch) | |
| tree | 6e6001c2958c3509bd31d064a309e192deb0e8e2 /src/s2wasm.h | |
| parent | 2faeb4e6608807455e6411e02c48ef5c03bae654 (diff) | |
| parent | 6c4c158537c3ad0b8819312c8a6c737df1cdfdc6 (diff) | |
| download | binaryen-7d69ee4af775c4cd48e509c66330fa8ceecf4a24.tar.gz binaryen-7d69ee4af775c4cd48e509c66330fa8ceecf4a24.tar.bz2 binaryen-7d69ee4af775c4cd48e509c66330fa8ceecf4a24.zip | |
Merge branch 'private-label-names'
Conflicts:
test/llvm_autogenerated/cfg-stackify.wast
test/llvm_autogenerated/switch.wast
Diffstat (limited to 'src/s2wasm.h')
| -rw-r--r-- | src/s2wasm.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/s2wasm.h b/src/s2wasm.h index 48d6d9350..4e3ec23e5 100644 --- a/src/s2wasm.h +++ b/src/s2wasm.h @@ -752,8 +752,8 @@ private: bstack.back()->list.push_back(curr); bstack.push_back(curr); seenLabels.insert(curr->name); - } else if (match("BB")) { - s -= 2; + } else if (match(".LBB")) { + s -= 4; lastLabel = getStrToColon(); s++; skipWhitespace(); @@ -825,7 +825,7 @@ private: makeHost(MemorySize); } else if (match("grow_memory")) { makeHost1(GrowMemory); - } else if (match("func_end")) { + } else if (match(".Lfunc_end")) { s = strchr(s, '\n'); s++; s = strchr(s, '\n'); |