Changeset 208323 in webkit


Ignore:
Timestamp:
Nov 2, 2016 9:21:30 PM (7 years ago)
Author:
Yusuke Suzuki
Message:

Unreviewed, fix CLoop build after r208320.
​https://bugs.webkit.org/show_bug.cgi?id=162980

Source/JavaScriptCore:

Add required forward declarations.

  • domjit/DOMJITHeapRange.cpp:
  • domjit/DOMJITSignature.h:
  • runtime/VM.h:

Source/WebCore:

Guard with ENABLE(JIT).

  • bindings/scripts/CodeGeneratorJS.pm:

(GenerateImplementation):

  • bindings/scripts/test/JS/JSTestDOMJIT.cpp:
Location:
trunk/Source
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r208320 r208323  
     12016-11-02  Yusuke Suzuki  <utatane.tea@gmail.com>
     2
     3        Unreviewed, fix CLoop build after r208320.
     4        https://bugs.webkit.org/show_bug.cgi?id=162980
     5
     6        Add required forward declarations.
     7
     8        * domjit/DOMJITHeapRange.cpp:
     9        * domjit/DOMJITSignature.h:
     10        * runtime/VM.h:
     11
    1122016-11-02  Yusuke Suzuki  <utatane.tea@gmail.com>
    213

  • trunk/Source/JavaScriptCore/domjit/DOMJITHeapRange.cpp

    r207787 r208323  
    2727#include "DOMJITHeapRange.h"
    2828
    29 #if ENABLE(JIT)
    30 
    3129namespace JSC { namespace DOMJIT {
    3230
    … …  
    3735
    3836} }
    39 
    40 #endif

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

    r208320 r208323  
    5656    }
    5757
     58#if ENABLE(JIT)
    5859    Ref<Patchpoint> checkDOM() const
    5960    {
    6061        return checkDOMGeneratorFunction();
    6162    }
     63#endif
    6264
    6365    uintptr_t unsafeFunction;

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

    r208320 r208323  
    142142class Database;
    143143}
     144namespace DOMJIT {
     145class Signature;
     146}
    144147
    145148struct HashTable;

  • trunk/Source/WebCore/ChangeLog

    r208322 r208323  
     12016-11-02  Yusuke Suzuki  <utatane.tea@gmail.com>
     2
     3        Unreviewed, fix CLoop build after r208320.
     4        https://bugs.webkit.org/show_bug.cgi?id=162980
     5
     6        Guard with ENABLE(JIT).
     7
     8        * bindings/scripts/CodeGeneratorJS.pm:
     9        (GenerateImplementation):
     10        * bindings/scripts/test/JS/JSTestDOMJIT.cpp:
     11
    1122016-11-02  Brady Eidson  <beidson@apple.com>
    213

  • trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

    r208320 r208323  
    27022702            my $classInfo = "JS" . $interface->type->name . "::info()";
    27032703            my $resultType = GetResultTypeFilter($interface, $function->type);
    2704             my $domJITSignature = "static const JSC::DOMJIT::Signature ${domJITSignatureName}((uintptr_t)${unsafeFunctionName}, DOMJIT::checkDOM<$interfaceName>, $classInfo, JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), ${resultType}";
     2704            my $domJITSignatureHeader = "static const JSC::DOMJIT::Signature ${domJITSignatureName}((uintptr_t)${unsafeFunctionName},";
     2705            my $domJITSignatureFooter = "$classInfo, JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), ${resultType}";
    27052706            foreach my $argument (@{$function->arguments}) {
    27062707                my $type = $argument->type;
    27072708                my $argumentType = GetArgumentTypeFilter($interface, $type);
    2708                 $domJITSignature .= ", ${argumentType}";
    2709             }
     2709                $domJITSignatureFooter .= ", ${argumentType}";
     2710            }
     2711            $domJITSignatureFooter .= ");";
    27102712            my $conditionalString = $codeGenerator->GenerateConditionalString($function);
    27112713            push(@implContent, "#if ${conditionalString}\n") if $conditionalString;
    2712             push(@implContent, $domJITSignature . ");\n");
     2714            push(@implContent, "#if ENABLE(JIT)\n");
     2715            push(@implContent, "$domJITSignatureHeader DOMJIT::checkDOM<$interfaceName>, $domJITSignatureFooter\n");
     2716            push(@implContent, "#else\n");
     2717            push(@implContent, "$domJITSignatureHeader nullptr, $domJITSignatureFooter\n");
     2718            push(@implContent, "#endif\n");
    27132719            push(@implContent, "#endif\n") if $conditionalString;
    27142720            push(@implContent, "\n");

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestDOMJIT.cpp

    r208320 r208323  
    9696bool setJSTestDOMJITConstructor(JSC::ExecState*, JSC::EncodedJSValue, JSC::EncodedJSValue);
    9797
     98#if ENABLE(JIT)
    9899static const JSC::DOMJIT::Signature DOMJITSignatureForTestDOMJITGetAttribute((uintptr_t)unsafeJsTestDOMJITPrototypeFunctionGetAttribute, DOMJIT::checkDOM<TestDOMJIT>, JSTestDOMJIT::info(), JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), DOMJIT::IDLResultTypeFilter<IDLNullable<IDLDOMString>>::value, DOMJIT::IDLArgumentTypeFilter<IDLDOMString>::value);
    99 
     100#else
     101static const JSC::DOMJIT::Signature DOMJITSignatureForTestDOMJITGetAttribute((uintptr_t)unsafeJsTestDOMJITPrototypeFunctionGetAttribute, nullptr, JSTestDOMJIT::info(), JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), DOMJIT::IDLResultTypeFilter<IDLNullable<IDLDOMString>>::value, DOMJIT::IDLArgumentTypeFilter<IDLDOMString>::value);
     102#endif
     103
     104#if ENABLE(JIT)
    100105static const JSC::DOMJIT::Signature DOMJITSignatureForTestDOMJITItem((uintptr_t)unsafeJsTestDOMJITPrototypeFunctionItem, DOMJIT::checkDOM<TestDOMJIT>, JSTestDOMJIT::info(), JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), DOMJIT::IDLResultTypeFilter<IDLDOMString>::value, DOMJIT::IDLArgumentTypeFilter<IDLUnsignedShort>::value, DOMJIT::IDLArgumentTypeFilter<IDLUnsignedShort>::value);
    101 
     106#else
     107static const JSC::DOMJIT::Signature DOMJITSignatureForTestDOMJITItem((uintptr_t)unsafeJsTestDOMJITPrototypeFunctionItem, nullptr, JSTestDOMJIT::info(), JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), DOMJIT::IDLResultTypeFilter<IDLDOMString>::value, DOMJIT::IDLArgumentTypeFilter<IDLUnsignedShort>::value, DOMJIT::IDLArgumentTypeFilter<IDLUnsignedShort>::value);
     108#endif
     109
     110#if ENABLE(JIT)
    102111static const JSC::DOMJIT::Signature DOMJITSignatureForTestDOMJITHasAttribute((uintptr_t)unsafeJsTestDOMJITPrototypeFunctionHasAttribute, DOMJIT::checkDOM<TestDOMJIT>, JSTestDOMJIT::info(), JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), DOMJIT::IDLResultTypeFilter<IDLBoolean>::value);
    103 
     112#else
     113static const JSC::DOMJIT::Signature DOMJITSignatureForTestDOMJITHasAttribute((uintptr_t)unsafeJsTestDOMJITPrototypeFunctionHasAttribute, nullptr, JSTestDOMJIT::info(), JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), DOMJIT::IDLResultTypeFilter<IDLBoolean>::value);
     114#endif
     115
     116#if ENABLE(JIT)
    104117static const JSC::DOMJIT::Signature DOMJITSignatureForTestDOMJITGetElementById((uintptr_t)unsafeJsTestDOMJITPrototypeFunctionGetElementById, DOMJIT::checkDOM<TestDOMJIT>, JSTestDOMJIT::info(), JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), DOMJIT::IDLResultTypeFilter<IDLInterface<Element>>::value, DOMJIT::IDLArgumentTypeFilter<IDLDOMString>::value);
    105 
     118#else
     119static const JSC::DOMJIT::Signature DOMJITSignatureForTestDOMJITGetElementById((uintptr_t)unsafeJsTestDOMJITPrototypeFunctionGetElementById, nullptr, JSTestDOMJIT::info(), JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), DOMJIT::IDLResultTypeFilter<IDLInterface<Element>>::value, DOMJIT::IDLArgumentTypeFilter<IDLDOMString>::value);
     120#endif
     121
     122#if ENABLE(JIT)
    106123static const JSC::DOMJIT::Signature DOMJITSignatureForTestDOMJITGetElementsByName((uintptr_t)unsafeJsTestDOMJITPrototypeFunctionGetElementsByName, DOMJIT::checkDOM<TestDOMJIT>, JSTestDOMJIT::info(), JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), DOMJIT::IDLResultTypeFilter<IDLInterface<NodeList>>::value, DOMJIT::IDLArgumentTypeFilter<IDLDOMString>::value);
     124#else
     125static const JSC::DOMJIT::Signature DOMJITSignatureForTestDOMJITGetElementsByName((uintptr_t)unsafeJsTestDOMJITPrototypeFunctionGetElementsByName, nullptr, JSTestDOMJIT::info(), JSC::DOMJIT::Effect::forRead(DOMJIT::AbstractHeapRepository::DOM), DOMJIT::IDLResultTypeFilter<IDLInterface<NodeList>>::value, DOMJIT::IDLArgumentTypeFilter<IDLDOMString>::value);
     126#endif
    107127
    108128class JSTestDOMJITPrototype : public JSC::JSNonFinalObject {
Note: See TracChangeset for help on using the changeset viewer.