Bug 1523081 - ifdef all of wasm DataCount, DataDrop and ElemDrop to fix bustage if ENABLE_WASM_BULKMEM_OPS is not set r=arai
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sun, 27 Jan 2019 23:45:11 +0000
changeset 515593 2bad68e1de18761ea1c256781269f98c931b3a80
parent 515592 3c9634352cd66e1debc3beeedd53130d16474db2
child 515594 8774e60ceebbfd10869498171e0e5f02a8ad7d07
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersarai
bugs1523081
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1523081 - ifdef all of wasm DataCount, DataDrop and ElemDrop to fix bustage if ENABLE_WASM_BULKMEM_OPS is not set r=arai Differential Revision: https://phabricator.services.mozilla.com/D17784
js/src/wasm/WasmTextToBinary.cpp
--- a/js/src/wasm/WasmTextToBinary.cpp
+++ b/js/src/wasm/WasmTextToBinary.cpp
@@ -985,34 +985,38 @@ WasmToken WasmTokenStream::next() {
       }
       if (consume(u"current_memory")) {
         return WasmToken(WasmToken::CurrentMemory, begin, cur_);
       }
       break;
 
     case 'd':
       if (consume(u"data")) {
+#ifdef ENABLE_WASM_BULKMEM_OPS
         if (consume(u"count")) {
           return WasmToken(WasmToken::DataCount, begin, cur_);
         }
         if (consume(u".drop")) {
           return WasmToken(WasmToken::DataDrop, begin, cur_);
         }
+#endif
         return WasmToken(WasmToken::Data, begin, cur_);
       }
       if (consume(u"drop")) {
         return WasmToken(WasmToken::Drop, begin, cur_);
       }
       break;
 
     case 'e':
       if (consume(u"elem")) {
+#ifdef ENABLE_WASM_BULKMEM_OPS
         if (consume(u".drop")) {
           return WasmToken(WasmToken::ElemDrop, begin, cur_);
         }
+#endif
         return WasmToken(WasmToken::Elem, begin, cur_);
       }
       if (consume(u"else")) {
         return WasmToken(WasmToken::Else, begin, cur_);
       }
       if (consume(u"end")) {
         return WasmToken(WasmToken::End, begin, cur_);
       }