address comments

Author: tlively

src/tools/fuzzing/fuzzing.cpp

@@ -2814,7 +2814,7 @@ Expression* TranslateToFuzzReader::makeStringConcat() {
 }
 
 Expression* TranslateToFuzzReader::makeStringSlice() {
-  auto* ref = make(Type(HeapType::string, getNullability()));
+  auto* ref = makeTrappingRefUse(HeapType::string);
   auto* start = make(Type::i32);
   auto* end = make(Type::i32);
   return builder.makeStringSliceWTF(ref, start, end);
@@ -2845,7 +2845,7 @@ Expression* TranslateToFuzzReader::makeStringMeasure(Type type) {
 Expression* TranslateToFuzzReader::makeStringGet(Type type) {
   assert(type == Type::i32);
 
-  auto* ref = make(Type(HeapType::string, getNullability()));
+  auto* ref = makeTrappingRefUse(HeapType::string);
   auto* pos = make(Type::i32);
   return builder.makeStringWTF16Get(ref, pos);
 }

src/wasm/wasm-stack.cpp

@@ -2653,6 +2653,8 @@ InsertOrderedMap<Type, Index> BinaryInstWriter::countScratchLocals() {
       if (curr->type == Type::unreachable) {
         return;
       }
+      // Scratch local to hold the `pos` value while we emit a stringview
+      // conversion for the `ref` value.
       auto& count = scratches[Type::i32];
       count = std::max(count, 1u);
     }
@@ -2661,6 +2663,8 @@ InsertOrderedMap<Type, Index> BinaryInstWriter::countScratchLocals() {
       if (curr->type == Type::unreachable) {
         return;
       }
+      // Scratch locals to hold the `start` and `end` values while we emit a
+      // stringview conversion for the `ref` value.
       auto& count = scratches[Type::i32];
       count = std::max(count, 2u);
     }

test/binaryen.js/kitchen-sink.js

@@ -179,13 +179,8 @@ function test_ids() {
   console.log("StringEncode: " + binaryen.StringEncodeId);
   console.log("StringConcat: " + binaryen.StringConcatId);
   console.log("StringEq: " + binaryen.StringEqId);
-  console.log("StringAs: " + binaryen.StringAsId);
-  console.log("StringWTF8Advance: " + binaryen.StringWTF8AdvanceId);
   console.log("StringWTF16Get: " + binaryen.StringWTF16GetId);
-  console.log("StringIterNext: " + binaryen.StringIterNextId);
-  console.log("StringIterMove: " + binaryen.StringIterMoveId);
   console.log("StringSliceWTF: " + binaryen.StringSliceWTFId);
-  console.log("StringSliceIter: " + binaryen.StringSliceIterId);
 }
 
 function test_core() {

test/binaryen.js/kitchen-sink.js.txt

@@ -109,13 +109,8 @@ StringMeasure: 81
 StringEncode: 82
 StringConcat: 83
 StringEq: 84
-StringAs: undefined
-StringWTF8Advance: undefined
 StringWTF16Get: 85
-StringIterNext: undefined
-StringIterMove: undefined
 StringSliceWTF: 86
-StringSliceIter: undefined
 getExpressionInfo={"id":15,"type":4,"op":6}
 (f32.neg
  (f32.const -33.61199951171875)