diff --git a/js/src/frontend/BinASTTokenReaderContext.cpp b/js/src/frontend/BinASTTokenReaderContext.cpp index e2a9dfc8309c..4e7ee5521e90 100644 --- a/js/src/frontend/BinASTTokenReaderContext.cpp +++ b/js/src/frontend/BinASTTokenReaderContext.cpp @@ -181,12 +181,6 @@ class HuffmanPreludeReader { using Table = HuffmanTableIndexedSymbolsLiteralString; explicit String(const NormalizedInterfaceAndField identity) : EntryExplicit(identity) {} -#ifdef DEBUG - static void dump(SymbolType symbol) { - fprintf(stderr, " "); - symbol->dump(); - } -#endif // DEBUG }; using IdentifierName = String; using PropertyKey = String; @@ -198,16 +192,6 @@ class HuffmanPreludeReader { using Table = HuffmanTableIndexedSymbolsOptionalLiteralString; explicit MaybeString(const NormalizedInterfaceAndField identity) : EntryExplicit(identity) {} -#ifdef DEBUG - static void dump(SymbolType symbol) { - fprintf(stderr, " "); - if (symbol) { - symbol->dump(); - } else { - fprintf(stderr, "(null)\n"); - } - } -#endif // DEBUG }; using MaybeIdentifierName = MaybeString; using MaybePropertyKey = MaybeString; @@ -218,11 +202,6 @@ class HuffmanPreludeReader { using Table = HuffmanTableExplicitSymbolsF64; explicit Number(const NormalizedInterfaceAndField identity) : EntryExplicit(identity) {} -#ifdef DEBUG - static void dump(SymbolType symbol) { - fprintf(stderr, " %f\n", symbol); - } -#endif // DEBUG }; // A 32-bit integer. May not be null. @@ -231,11 +210,6 @@ class HuffmanPreludeReader { using Table = HuffmanTableExplicitSymbolsU32; explicit UnsignedLong(const NormalizedInterfaceAndField identity) : EntryExplicit(identity) {} -#ifdef DEBUG - static void dump(SymbolType symbol) { - fprintf(stderr, " %d\n", symbol); - } -#endif // DEBUG }; // A boolean. May not be null. @@ -245,11 +219,6 @@ class HuffmanPreludeReader { explicit Boolean(const NormalizedInterfaceAndField identity) : EntryIndexed(identity) {} -#ifdef DEBUG - static void dump(SymbolType symbol) { - fprintf(stderr, " %s\n", symbol ? "true" : "false"); - } -#endif // DEBUG // Comparing booleans. // @@ -276,12 +245,6 @@ class HuffmanPreludeReader { Interface(const NormalizedInterfaceAndField identity, BinASTKind kind) : EntryIndexed(identity), kind(kind) {} -#ifdef DEBUG - static void dump(SymbolType symbol) { - fprintf(stderr, " %s\n", describeBinASTKind(symbol)); - } -#endif // DEBUG - // Utility struct, used in macros to call the constructor as // `Interface::Maker(kind)(identity)`. struct Maker { @@ -300,12 +263,6 @@ class HuffmanPreludeReader { // The kind of the interface. const BinASTKind kind; -#ifdef DEBUG - static void dump(SymbolType symbol) { - fprintf(stderr, " %s\n", describeBinASTKind(symbol)); - } -#endif // DEBUG - // Comparing optional interfaces. // // As 0 == Null < _ == 1, we only compare indices. @@ -344,12 +301,6 @@ class HuffmanPreludeReader { // The table for the length of the list. using Table = HuffmanTableExplicitSymbolsListLength; -#ifdef DEBUG - static void dump(SymbolType symbol) { - fprintf(stderr, " %d\n", symbol); - } -#endif // DEBUG - // The type of the list, e.g. list of numbers. // All lists with the same type share a model for their length. const BinASTList contents; @@ -383,12 +334,6 @@ class HuffmanPreludeReader { // The type of values in the sum. const BinASTSum contents; -#ifdef DEBUG - static void dump(SymbolType symbol) { - fprintf(stderr, " %s\n", describeBinASTKind(symbol)); - } -#endif // DEBUG - // Comparing sum entries. // // By specification, we need to use string comparison. @@ -435,12 +380,6 @@ class HuffmanPreludeReader { // The type of values in the sum. const BinASTSum contents; -#ifdef DEBUG - static void dump(SymbolType symbol) { - fprintf(stderr, " %s\n", describeBinASTKind(symbol)); - } -#endif // DEBUG - inline bool lessThan(uint32_t aIndex, uint32_t bIndex) { return aIndex < bIndex; } @@ -477,12 +416,6 @@ class HuffmanPreludeReader { using SymbolType = BinASTVariant; using Table = HuffmanTableIndexedSymbolsStringEnum; -#ifdef DEBUG - static void dump(SymbolType symbol) { - fprintf(stderr, " %s\n", describeBinASTVariant(symbol)); - } -#endif // DEBUG - // Comparing string enums. // // By specification, we need to use string comparison. @@ -903,11 +836,6 @@ class HuffmanPreludeReader { // 1. If the field’s type is an array type, the effective type is the // array element type. Stop. -#ifdef DEBUG - fprintf(stderr, "PushEntryMatcher: Proceeding with List contents of %s\n", - describeBinASTInterfaceAndField(identity.identity)); -#endif // DEBUG_BINAST - // We now recurse with the contents of the list/array, *without checking // whether the field has already been visited*. switch (list.contents) { @@ -927,11 +855,6 @@ class HuffmanPreludeReader { } MOZ_MUST_USE JS::Result operator()(const Interface& interface) { -#ifdef DEBUG - fprintf(stderr, "PushEntryMatcher: Visiting interface %s\n", - describeBinASTInterfaceAndField(interface.identity.identity)); -#endif // DEBUG_BINAST - // Note: In this case, for compatibility, we do *not* check whether // the interface has already been visited. auto& table = owner.dictionary.tableForField(identity); @@ -953,8 +876,6 @@ class HuffmanPreludeReader { // Generic implementation for other cases. template MOZ_MUST_USE JS::Result operator()(const Entry& entry) { - fprintf(stderr, "PushEntryMatcher: Entry %s\n", - describeBinASTInterfaceAndField(entry.identity.identity)); // Spec: // 1. If the field is in the set of visited contexts, stop. auto& table = owner.dictionary.tableForField(identity); @@ -969,12 +890,6 @@ class HuffmanPreludeReader { // Spec: // 5. Otherwise, push the field onto the stack -#ifdef DEBUG - fprintf(stderr, "pushing entry %s (%zu entries)\n", - describeBinASTInterfaceAndField(entry.identity.identity), - owner.stack.length() + 1); -#endif // DEBUG_BINAST - BINJS_TRY(owner.stack.append(entry)); return Ok(); } @@ -1792,13 +1707,7 @@ MOZ_MUST_USE JS::Result HuffmanPreludeReader::run(size_t initialCapacity) { MOZ_TRY(pushFields(BinASTKind::Script)); while (stack.length() > 0) { const Entry entry = stack.popCopy(); -#ifdef DEBUG - PrintEntry::print("popping", entry); -#endif // DEBUG_BINAST MOZ_TRY(entry.match(ReadPoppedEntryMatcher(*this))); -#ifdef DEBUG - PrintEntry::print("pop complete", entry); -#endif // DEBUG_BINAST } return Ok(); }