Changeset 230856 in webkit


Ignore:
Timestamp:
Apr 20, 2018 2:10:56 PM (6 years ago)
Author:
dbates@webkit.org
Message:

Remove code for compilers that did not support NSDMI for aggregates
​https://bugs.webkit.org/show_bug.cgi?id=184599

Reviewed by Per Arne Vollan.

Remove workaround for earlier Visual Studio versions that did not support non-static data
member initializers (NSDMI) for aggregates. We have since updated all the build.webkit.org
and EWS bots to a newer version that supports this feature.

Source/bmalloc:

  • bmalloc/BPlatform.h:
  • bmalloc/List.h:

(bmalloc::ListNode::ListNode): Deleted.
(bmalloc::List::iterator::iterator): Deleted.

Source/JavaScriptCore:

  • domjit/DOMJITEffect.h:

(JSC::DOMJIT::Effect::Effect): Deleted.

  • runtime/HasOwnPropertyCache.h:

(JSC::HasOwnPropertyCache::Entry::Entry): Deleted.

  • wasm/WasmFormat.h:

(JSC::Wasm::WasmToWasmImportableFunction::WasmToWasmImportableFunction): Deleted.

Source/WebCore:

  • Modules/cache/CacheQueryOptions.h:

(WebCore::CacheQueryOptions::CacheQueryOptions): Deleted.

  • dom/Node.h:

(WebCore::Node::InsertionType::InsertionType): Deleted.
(WebCore::Node::RemovalType::RemovalType): Deleted.

  • html/canvas/CanvasStyle.h:

(WebCore::CanvasStyle::CMYKAColor::CMYKAColor): Deleted.

  • page/EventHandler.h:

(WebCore::EventHandler::DragTargetResponse::DragTargetResponse): Deleted.

  • page/animation/CSSAnimationController.h:

(WebCore::AnimationUpdate::AnimationUpdate): Deleted.

  • platform/graphics/FontSelectionAlgorithm.h:

(WebCore::FontSelectionRequest::tied const):
(WebCore::FontSelectionRequest::FontSelectionRequest): Deleted.
(WebCore::FontSelectionCapabilities::FontSelectionCapabilities): Deleted.

  • platform/mediastream/IceCandidate.h:

(WebCore::IceCandidate::IceCandidate): Deleted.

  • platform/text/StringWithDirection.h:

(WebCore::StringWithDirection::StringWithDirection): Deleted.

  • rendering/MarkedText.h:

(WebCore::MarkedText::MarkedText): Deleted.

  • style/StyleUpdate.h:

(WebCore::Style::ElementUpdate::ElementUpdate): Deleted.
(WebCore::Style::ElementUpdates::ElementUpdates): Deleted.
(WebCore::Style::TextUpdate::TextUpdate): Deleted.

Source/WTF:

  • wtf/Compiler.h:
Location:
trunk/Source
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r230852 r230856  
     12018-04-20  Daniel Bates  <dabates@apple.com>
     2
     3        Remove code for compilers that did not support NSDMI for aggregates
     4        https://bugs.webkit.org/show_bug.cgi?id=184599
     5
     6        Reviewed by Per Arne Vollan.
     7
     8        Remove workaround for earlier Visual Studio versions that did not support non-static data
     9        member initializers (NSDMI) for aggregates. We have since updated all the build.webkit.org
     10        and EWS bots to a newer version that supports this feature.
     11
     12        * domjit/DOMJITEffect.h:
     13        (JSC::DOMJIT::Effect::Effect): Deleted.
     14        * runtime/HasOwnPropertyCache.h:
     15        (JSC::HasOwnPropertyCache::Entry::Entry): Deleted.
     16        * wasm/WasmFormat.h:
     17        (JSC::Wasm::WasmToWasmImportableFunction::WasmToWasmImportableFunction): Deleted.
     18
    1192018-04-20  Mark Lam  <mark.lam@apple.com>
    220

  • trunk/Source/JavaScriptCore/domjit/DOMJITEffect.h

    r221213 r230856  
    3131
    3232struct Effect {
    33 #if !COMPILER_SUPPORTS(NSDMI_FOR_AGGREGATES)
    34     constexpr Effect() = default;
    35     constexpr Effect(HeapRange reads, HeapRange writes)
    36         : reads { reads }
    37         , writes { writes }
    38     {
    39     }
    40     constexpr Effect(HeapRange reads, HeapRange writes, HeapRange def)
    41         : reads { reads }
    42         , writes { writes }
    43         , def { def }
    44     {
    45     }
    46 #endif
    4733
    4834    constexpr static Effect forWrite(HeapRange writeRange)

  • trunk/Source/JavaScriptCore/runtime/HasOwnPropertyCache.h

    r221213 r230856  
    4242        static ptrdiff_t offsetOfImpl() { return OBJECT_OFFSETOF(Entry, impl); }
    4343        static ptrdiff_t offsetOfResult() { return OBJECT_OFFSETOF(Entry, result); }
    44 
    45 #if !COMPILER_SUPPORTS(NSDMI_FOR_AGGREGATES)
    46         Entry() = default;
    47         Entry(RefPtr<UniquedStringImpl>&& impl, StructureID structureID, bool result)
    48             : impl { WTFMove(impl) }
    49             , structureID { structureID }
    50             , result { result }
    51         {
    52         }
    53 
    54         Entry& operator=(Entry&& other) = default;
    55 #endif
    5644
    5745        RefPtr<UniquedStringImpl> impl;

  • trunk/Source/JavaScriptCore/wasm/WasmFormat.h

    r230748 r230856  
    276276struct WasmToWasmImportableFunction {
    277277    using LoadLocation = MacroAssemblerCodePtr<WasmEntryPtrTag>*;
    278 #if !COMPILER_SUPPORTS(NSDMI_FOR_AGGREGATES)
    279     WasmToWasmImportableFunction() = default;
    280     WasmToWasmImportableFunction(SignatureIndex signatureIndex, LoadLocation entrypointLoadLocation)
    281         : signatureIndex { signatureIndex }
    282         , entrypointLoadLocation { entrypointLoadLocation }
    283     {
    284     }
    285 #endif
    286 
    287278    static ptrdiff_t offsetOfEntrypointLoadLocation() { return OBJECT_OFFSETOF(WasmToWasmImportableFunction, entrypointLoadLocation); }
    288279

  • trunk/Source/WTF/ChangeLog

    r230824 r230856  
     12018-04-20  Daniel Bates  <dabates@apple.com>
     2
     3        Remove code for compilers that did not support NSDMI for aggregates
     4        https://bugs.webkit.org/show_bug.cgi?id=184599
     5
     6        Reviewed by Per Arne Vollan.
     7
     8        Remove workaround for earlier Visual Studio versions that did not support non-static data
     9        member initializers (NSDMI) for aggregates. We have since updated all the build.webkit.org
     10        and EWS bots to a newer version that supports this feature.
     11
     12        * wtf/Compiler.h:
     13
    1142018-04-19  David Kilzer  <ddkilzer@apple.com>
    215

  • trunk/Source/WTF/wtf/Compiler.h

    r230113 r230856  
    146146#endif
    147147
    148 /* Non-static data member initializer (NSDMI) for aggregates */
    149 
    150 #if defined(__cpp_aggregate_nsdmi) && __cpp_aggregate_nsdmi >= 201304
    151 #define WTF_COMPILER_SUPPORTS_NSDMI_FOR_AGGREGATES 1
    152 #endif
     148/* ASAN_ENABLED and SUPPRESS_ASAN */
    153149
    154150#define ASAN_ENABLED COMPILER_HAS_CLANG_FEATURE(address_sanitizer)

  • trunk/Source/WebCore/ChangeLog

    r230853 r230856  
     12018-04-20  Daniel Bates  <dabates@apple.com>
     2
     3        Remove code for compilers that did not support NSDMI for aggregates
     4        https://bugs.webkit.org/show_bug.cgi?id=184599
     5
     6        Reviewed by Per Arne Vollan.
     7
     8        Remove workaround for earlier Visual Studio versions that did not support non-static data
     9        member initializers (NSDMI) for aggregates. We have since updated all the build.webkit.org
     10        and EWS bots to a newer version that supports this feature.
     11
     12        * Modules/cache/CacheQueryOptions.h:
     13        (WebCore::CacheQueryOptions::CacheQueryOptions): Deleted.
     14        * dom/Node.h:
     15        (WebCore::Node::InsertionType::InsertionType): Deleted.
     16        (WebCore::Node::RemovalType::RemovalType): Deleted.
     17        * html/canvas/CanvasStyle.h:
     18        (WebCore::CanvasStyle::CMYKAColor::CMYKAColor): Deleted.
     19        * page/EventHandler.h:
     20        (WebCore::EventHandler::DragTargetResponse::DragTargetResponse): Deleted.
     21        * page/animation/CSSAnimationController.h:
     22        (WebCore::AnimationUpdate::AnimationUpdate): Deleted.
     23        * platform/graphics/FontSelectionAlgorithm.h:
     24        (WebCore::FontSelectionRequest::tied const):
     25        (WebCore::FontSelectionRequest::FontSelectionRequest): Deleted.
     26        (WebCore::FontSelectionCapabilities::FontSelectionCapabilities): Deleted.
     27        * platform/mediastream/IceCandidate.h:
     28        (WebCore::IceCandidate::IceCandidate): Deleted.
     29        * platform/text/StringWithDirection.h:
     30        (WebCore::StringWithDirection::StringWithDirection): Deleted.
     31        * rendering/MarkedText.h:
     32        (WebCore::MarkedText::MarkedText): Deleted.
     33        * style/StyleUpdate.h:
     34        (WebCore::Style::ElementUpdate::ElementUpdate): Deleted.
     35        (WebCore::Style::ElementUpdates::ElementUpdates): Deleted.
     36        (WebCore::Style::TextUpdate::TextUpdate): Deleted.
     37
    1382018-04-20  Youenn Fablet  <youenn@apple.com>
    239

  • trunk/Source/WebCore/Modules/cache/CacheQueryOptions.h

    r221306 r230856  
    3131
    3232struct CacheQueryOptions {
    33 #if !COMPILER_SUPPORTS(NSDMI_FOR_AGGREGATES)
    34     CacheQueryOptions() = default;
    35     CacheQueryOptions(bool ignoreSearch, bool ignoreMethod, bool ignoreVary, String&& cacheName)
    36         : ignoreSearch { ignoreSearch }
    37         , ignoreMethod { ignoreMethod }
    38         , ignoreVary { ignoreVary }
    39         , cacheName { WTFMove(cacheName) }
    40     {
    41     }
    42 #endif
    4333    CacheQueryOptions isolatedCopy() const { return { ignoreSearch, ignoreMethod, ignoreVary, cacheName.isolatedCopy() }; }
    4434

  • trunk/Source/WebCore/dom/Node.h

    r230229 r230856  
    441441
    442442    struct InsertionType {
    443 #if !COMPILER_SUPPORTS(NSDMI_FOR_AGGREGATES)
    444         InsertionType(bool connectedToDocument, bool treeScopeChanged)
    445             : connectedToDocument(connectedToDocument)
    446             , treeScopeChanged(treeScopeChanged)
    447         { }
    448 #endif
    449443        bool connectedToDocument { false };
    450444        bool treeScopeChanged { false };
    … …  
    456450
    457451    struct RemovalType {
    458 #if !COMPILER_SUPPORTS(NSDMI_FOR_AGGREGATES)
    459         RemovalType(bool disconnectedFromDocument, bool treeScopeChanged)
    460             : disconnectedFromDocument(disconnectedFromDocument)
    461             , treeScopeChanged(treeScopeChanged)
    462         { }
    463 #endif
    464452        bool disconnectedFromDocument { false };
    465453        bool treeScopeChanged { false };

  • trunk/Source/WebCore/html/canvas/CanvasStyle.h

    r224390 r230856  
    7171
    7272    struct CMYKAColor {
    73 #if !COMPILER_SUPPORTS(NSDMI_FOR_AGGREGATES)
    74         CMYKAColor() = default;
    75         CMYKAColor(Color color, float cyan, float magenta, float yellow, float black, float alpha)
    76             : color(color), c(cyan), m(magenta), y(yellow), k(black), a(alpha)
    77         {
    78         }
    79 #endif
    80 
    8173        Color color;
    8274        float c { 0 };

  • trunk/Source/WebCore/page/EventHandler.h

    r228549 r230856  
    159159#if ENABLE(DRAG_SUPPORT)
    160160    struct DragTargetResponse {
    161 #if !COMPILER_SUPPORTS(NSDMI_FOR_AGGREGATES)
    162         DragTargetResponse() = default;
    163         DragTargetResponse(bool accept, std::optional<DragOperation> operation)
    164             : accept(accept)
    165             , operation(operation)
    166         {
    167         }
    168 #endif
    169161        bool accept { false };
    170162        std::optional<DragOperation> operation;

  • trunk/Source/WebCore/page/animation/CSSAnimationController.h

    r229174 r230856  
    4444
    4545struct AnimationUpdate {
    46 #if !COMPILER_SUPPORTS(NSDMI_FOR_AGGREGATES)
    47     AnimationUpdate() = default;
    48     AnimationUpdate(std::unique_ptr<RenderStyle> style, bool stateChanged)
    49         : style(WTFMove(style))
    50         , stateChanged(stateChanged)
    51     { }
    52 #endif
    5346    std::unique_ptr<RenderStyle> style;
    5447    bool stateChanged { false };

  • trunk/Source/WebCore/platform/graphics/FontSelectionAlgorithm.h

    r226300 r230856  
    338338        return WTF::tie(weight, width, slope);
    339339    }
    340 
    341 #if !COMPILER_SUPPORTS(NSDMI_FOR_AGGREGATES)
    342     FontSelectionRequest() = default;
    343 
    344     constexpr FontSelectionRequest(Value weight, Value width, Value slope)
    345         : weight(weight)
    346         , width(width)
    347         , slope(slope)
    348     {
    349     }
    350 #endif
    351340};
    352341
    … …  
    386375    Range width { normalStretchValue() };
    387376    Range slope { normalItalicValue() };
    388 
    389 #if !COMPILER_SUPPORTS(NSDMI_FOR_AGGREGATES)
    390     FontSelectionCapabilities() = default;
    391 
    392     constexpr FontSelectionCapabilities(Range weight, Range width, Range slope)
    393         : weight(weight)
    394         , width(width)
    395         , slope(slope)
    396     {
    397     }
    398 #endif
    399377};
    400378

  • trunk/Source/WebCore/platform/mediastream/IceCandidate.h

    r221213 r230856  
    3838
    3939struct IceCandidate {
    40 #if !COMPILER_SUPPORTS(NSDMI_FOR_AGGREGATES)
    41     IceCandidate() = default;
    42     IceCandidate(String&& type, String&& foundation, unsigned componentId, String&& transport, unsigned long priority, String&& address, unsigned port, String&& tcpType, String&& relatedAddress, unsigned relatedPort)
    43         : type { WTFMove(type) }
    44         , foundation { WTFMove(foundation) }
    45         , componentId { componentId }
    46         , transport { WTFMove(transport) }
    47         , priority { priority }
    48         , address { WTFMove(address) }
    49         , port { port }
    50         , tcpType { WTFMove(tcpType) }
    51         , relatedAddress { WTFMove(relatedAddress) }
    52         , relatedPort { relatedPort }
    53     {
    54     }
    55 #endif
    56 
    5740    String type;
    5841    String foundation;

  • trunk/Source/WebCore/platform/text/StringWithDirection.h

    r221921 r230856  
    4747
    4848struct StringWithDirection {
    49 #if !COMPILER_SUPPORTS(NSDMI_FOR_AGGREGATES)
    50     StringWithDirection() = default;
    51     StringWithDirection(String string, TextDirection direction)
    52         : string { WTFMove(string) }
    53         , direction { direction }
    54     {
    55     }
    56 #endif
    5749    String string;
    5850    TextDirection direction { LTR };

  • trunk/Source/WebCore/rendering/MarkedText.h

    r229079 r230856  
    4848        DraggedContent,
    4949    };
    50 #if !COMPILER_SUPPORTS(NSDMI_FOR_AGGREGATES)
    51     MarkedText() = default;
    52     MarkedText(unsigned startOffset, unsigned endOffset, Type type, const RenderedDocumentMarker* marker = nullptr)
    53         : startOffset { startOffset }
    54         , endOffset { endOffset }
    55         , type { type }
    56         , marker { marker }
    57     {
    58     }
    59 #endif
    6050    unsigned startOffset;
    6151    unsigned endOffset;

  • trunk/Source/WebCore/style/StyleUpdate.h

    r226809 r230856  
    4444
    4545struct ElementUpdate {
    46 #if !COMPILER_SUPPORTS(NSDMI_FOR_AGGREGATES)
    47     ElementUpdate() = default;
    48     ElementUpdate(std::unique_ptr<RenderStyle> style, Change change, bool recompositeLayer)
    49         : style { WTFMove(style) }
    50         , change { change }
    51         , recompositeLayer { recompositeLayer }
    52     {
    53     }
    54 #endif
    5546    std::unique_ptr<RenderStyle> style;
    5647    Change change { NoChange };
    … …  
    6152
    6253struct ElementUpdates {
    63 #if !COMPILER_SUPPORTS(NSDMI_FOR_AGGREGATES)
    64     ElementUpdates() = default;
    65     ElementUpdates(ElementUpdate update, DescendantsToResolve descendantsToResolve, std::optional<ElementUpdate> beforePseudoElementUpdate, std::optional<ElementUpdate> afterPseudoElementUpdate)
    66         : update { WTFMove(update) }
    67         , descendantsToResolve(descendantsToResolve)
    68         , beforePseudoElementUpdate { WTFMove(beforePseudoElementUpdate) }
    69         , afterPseudoElementUpdate { WTFMove(afterPseudoElementUpdate) }
    70     {
    71     }
    72 #endif
    7354    ElementUpdate update;
    7455    DescendantsToResolve descendantsToResolve { DescendantsToResolve::None };
    … …  
    7859
    7960struct TextUpdate {
    80 #if !COMPILER_SUPPORTS(NSDMI_FOR_AGGREGATES)
    81     TextUpdate() = default;
    82     TextUpdate(unsigned offset, unsigned length, std::optional<std::unique_ptr<RenderStyle>> inheritedDisplayContentsStyle)
    83         : offset { offset }
    84         , length { length }
    85         , inheritedDisplayContentsStyle { WTFMove(inheritedDisplayContentsStyle) }
    86     {
    87     }
    88 #endif
    89 
    9061    unsigned offset { 0 };
    9162    unsigned length { std::numeric_limits<unsigned>::max() };

  • trunk/Source/bmalloc/ChangeLog

    r230824 r230856  
     12018-04-20  Daniel Bates  <dabates@apple.com>
     2
     3        Remove code for compilers that did not support NSDMI for aggregates
     4        https://bugs.webkit.org/show_bug.cgi?id=184599
     5
     6        Reviewed by Per Arne Vollan.
     7
     8        Remove workaround for earlier Visual Studio versions that did not support non-static data
     9        member initializers (NSDMI) for aggregates. We have since updated all the build.webkit.org
     10        and EWS bots to a newer version that supports this feature.
     11
     12        * bmalloc/BPlatform.h:
     13        * bmalloc/List.h:
     14        (bmalloc::ListNode::ListNode): Deleted.
     15        (bmalloc::List::iterator::iterator): Deleted.
     16
    1172018-04-19  David Kilzer  <ddkilzer@apple.com>
    218

  • trunk/Source/bmalloc/bmalloc/BPlatform.h

    r230255 r230856  
    8282#define BCOMPILER_SUPPORTS(FEATURE) (defined BCOMPILER_SUPPORTS_##FEATURE && BCOMPILER_SUPPORTS_##FEATURE)
    8383
    84 /* BCOMPILER_SUPPORTS(NSDMI_FOR_AGGREGATES) - compiler supports non-static data member initializers for aggregates */
    85 #if defined(__cpp_aggregate_nsdmi) && __cpp_aggregate_nsdmi >= 201304
    86 #define BCOMPILER_SUPPORTS_NSDMI_FOR_AGGREGATES 1
    87 #endif
    88 
    8984/* ==== Platform adaptation macros: these describe properties of the target environment. ==== */
    9085

  • trunk/Source/bmalloc/bmalloc/List.h

    r221213 r230856  
    3131template<typename T>
    3232struct ListNode {
    33 #if !BCOMPILER_SUPPORTS(NSDMI_FOR_AGGREGATES)
    34     ListNode() = default;
    35     ListNode(ListNode<T>* prev, ListNode<T>* next)
    36         : prev { prev }
    37         , next { next }
    38     {
    39     }
    40 #endif
    41 
    4233    ListNode<T>* prev { nullptr };
    4334    ListNode<T>* next { nullptr };
    … …  
    4940
    5041    struct iterator {
    51 #if !BCOMPILER_SUPPORTS(NSDMI_FOR_AGGREGATES)
    52         iterator() = default;
    53         iterator(ListNode<T>* node)
    54             : m_node(node)
    55         {
    56         }
    57 #endif
    58 
    5942        T* operator*() { return static_cast<T*>(m_node); }
    6043        T* operator->() { return static_cast<T*>(m_node); }
Note: See TracChangeset for help on using the changeset viewer.