Commit 73e9f8e1 authored by Matthew Gaudet's avatar Matthew Gaudet
Browse files

Bug 1754977 - Don't build JS Streams when MOZ_DOM_STREAMS is enabled r=jandem 

Differential Revision: https://phabricator.services.mozilla.com/D138710
parent 49a5e1e3

js/public/ProtoKey.h

+92 −89
Original line number Diff line number Diff line
@@ -109,18 +109,21 @@ 
  REAL(AsyncFunction, CLASP(AsyncFunction))                                    \

  REAL(GeneratorFunction, CLASP(GeneratorFunction))                            \

  REAL(AsyncGeneratorFunction, CLASP(AsyncGeneratorFunction))                  \

  REAL(ReadableStream, &js::ReadableStream::class_)                           \

  REAL(ReadableStreamDefaultReader, &js::ReadableStreamDefaultReader::class_) \

  REAL(ReadableStreamDefaultController,                                       \

       &js::ReadableStreamDefaultController::class_)                          \

  REAL(ReadableByteStreamController,                                          \

       &js::ReadableByteStreamController::class_)                             \

  REAL(WritableStream, &js::WritableStream::class_)                           \

  REAL(WritableStreamDefaultController,                                       \

       &js::WritableStreamDefaultController::class_)                          \

  REAL(WritableStreamDefaultWriter, &js::WritableStreamDefaultWriter::class_) \

  REAL(ByteLengthQueuingStrategy, &js::ByteLengthQueuingStrategy::class_)     \

  REAL(CountQueuingStrategy, &js::CountQueuingStrategy::class_)               \

  IF_JS_STREAMS(REAL(ReadableStream, &js::ReadableStream::class_))             \

  IF_JS_STREAMS(REAL(ReadableStreamDefaultReader,                              \

                     &js::ReadableStreamDefaultReader::class_))                \

  IF_JS_STREAMS(REAL(ReadableStreamDefaultController,                          \

                     &js::ReadableStreamDefaultController::class_))            \

  IF_JS_STREAMS(REAL(ReadableByteStreamController,                             \

                     &js::ReadableByteStreamController::class_))               \

  IF_JS_STREAMS(REAL(WritableStream, &js::WritableStream::class_))             \

  IF_JS_STREAMS(REAL(WritableStreamDefaultController,                          \

                     &js::WritableStreamDefaultController::class_))            \

  IF_JS_STREAMS(REAL(WritableStreamDefaultWriter,                              \

                     &js::WritableStreamDefaultWriter::class_))                \

  IF_JS_STREAMS(                                                               \

      REAL(ByteLengthQueuingStrategy, &js::ByteLengthQueuingStrategy::class_)) \

  IF_JS_STREAMS(REAL(CountQueuingStrategy, &js::CountQueuingStrategy::class_)) \

  REAL(WebAssembly, OCLASP(WasmNamespace))                                     \

  REAL(WasmModule, OCLASP(WasmModule))                                         \

  REAL(WasmInstance, OCLASP(WasmInstance))                                     \

js/public/TypeDecls.h

+7 −0
Original line number Diff line number Diff line
@@ -142,4 +142,11 @@ using jsid = JS::PropertyKey; 
#  define IF_RECORD_TUPLE(x, ...) __VA_ARGS__

#endif



// Follows the same pattern as IF_RECORD_TUPLE

#ifndef MOZ_DOM_STREAMS

#  define IF_JS_STREAMS(x, ...) x

#else

#  define IF_JS_STREAMS(x, ...) __VA_ARGS__

#endif



#endif /* js_TypeDecls_h */

js/src/builtin/streams/PipeToState.cpp

+4 −0
Original line number Diff line number Diff line
@@ -8,6 +8,10 @@ 


#include "builtin/streams/PipeToState-inl.h"



#ifdef MOZ_DOM_STREAMS

#  error "Shouldnt be built"

#endif



#include "mozilla/Assertions.h"  // MOZ_ASSERT

#include "mozilla/Maybe.h"  // mozilla::Maybe, mozilla::Nothing, mozilla::Some

js/src/moz.build

+26 −22
Original line number Diff line number Diff line
@@ -314,28 +314,6 @@ UNIFIED_SOURCES += [ 
    "builtin/Promise.cpp",

    "builtin/Reflect.cpp",

    "builtin/ReflectParse.cpp",

    "builtin/Stream.cpp",

    "builtin/streams/MiscellaneousOperations.cpp",

    "builtin/streams/PipeToState.cpp",

    "builtin/streams/PullIntoDescriptor.cpp",

    "builtin/streams/QueueingStrategies.cpp",

    "builtin/streams/QueueWithSizes.cpp",

    "builtin/streams/ReadableStream.cpp",

    "builtin/streams/ReadableStreamBYOBReader.cpp",

    "builtin/streams/ReadableStreamDefaultController.cpp",

    "builtin/streams/ReadableStreamDefaultControllerOperations.cpp",

    "builtin/streams/ReadableStreamDefaultReader.cpp",

    "builtin/streams/ReadableStreamInternals.cpp",

    "builtin/streams/ReadableStreamOperations.cpp",

    "builtin/streams/ReadableStreamReader.cpp",

    "builtin/streams/StreamAPI.cpp",

    "builtin/streams/TeeState.cpp",

    "builtin/streams/WritableStream.cpp",

    "builtin/streams/WritableStreamDefaultController.cpp",

    "builtin/streams/WritableStreamDefaultControllerOperations.cpp",

    "builtin/streams/WritableStreamDefaultWriter.cpp",

    "builtin/streams/WritableStreamOperations.cpp",

    "builtin/streams/WritableStreamWriterOperations.cpp",

    "builtin/String.cpp",

    "builtin/Symbol.cpp",

    "builtin/TestingFunctions.cpp",
@@ -459,6 +437,32 @@ UNIFIED_SOURCES += [ 
    "vm/Xdr.cpp",

]



if not CONFIG["MOZ_DOM_STREAMS"]:

    UNIFIED_SOURCES += [

        "builtin/Stream.cpp",

        "builtin/streams/MiscellaneousOperations.cpp",

        "builtin/streams/PipeToState.cpp",

        "builtin/streams/PullIntoDescriptor.cpp",

        "builtin/streams/QueueingStrategies.cpp",

        "builtin/streams/QueueWithSizes.cpp",

        "builtin/streams/ReadableStream.cpp",

        "builtin/streams/ReadableStreamBYOBReader.cpp",

        "builtin/streams/ReadableStreamDefaultController.cpp",

        "builtin/streams/ReadableStreamDefaultControllerOperations.cpp",

        "builtin/streams/ReadableStreamDefaultReader.cpp",

        "builtin/streams/ReadableStreamInternals.cpp",

        "builtin/streams/ReadableStreamOperations.cpp",

        "builtin/streams/ReadableStreamReader.cpp",

        "builtin/streams/StreamAPI.cpp",

        "builtin/streams/TeeState.cpp",

        "builtin/streams/WritableStream.cpp",

        "builtin/streams/WritableStreamDefaultController.cpp",

        "builtin/streams/WritableStreamDefaultControllerOperations.cpp",

        "builtin/streams/WritableStreamDefaultWriter.cpp",

        "builtin/streams/WritableStreamOperations.cpp",

        "builtin/streams/WritableStreamWriterOperations.cpp",

    ]



# builtin/RegExp.cpp cannot be built in unified mode because it causes huge

#   win32 test slowdowns

# jsmath.cpp cannot be built in unified mode because it needs to re-#define the

js/src/vm/GlobalObject.cpp

+2 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ bool GlobalObject::skipDeselectedConstructor(JSContext* cx, JSProtoKey key) { 
    case JSProto_RelativeTimeFormat:

      return false;

#endif



#ifndef MOZ_DOM_STREAMS

    case JSProto_ReadableStream:

    case JSProto_ReadableStreamDefaultReader:

    case JSProto_ReadableStreamDefaultController:
@@ -204,6 +204,7 @@ bool GlobalObject::skipDeselectedConstructor(JSContext* cx, JSProtoKey key) { 
      return !realmOptions.getStreamsEnabled() ||

             !realmOptions.getWritableStreamsEnabled();

    }

#endif



    // Return true if the given constructor has been disabled at run-time.

    case JSProto_Atomics: