Attachment 371158 Details for Bug 198163 – WIP

[patch] WIP

file.html (text/plain), 4.08 KB, created by Myles C. Maxfield on 2019-06-02 10:44:07 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Myles C. Maxfield

Created: 2019-06-02 10:44:07 PDT

Size: 4.08 KB

patch

obsolete

>diff --git a/Source/WebCore/Modules/webgpu/WHLSL/WHLSLChecker.cpp b/Source/WebCore/Modules/webgpu/WHLSL/WHLSLChecker.cpp
>index d9c37ce27bb..a7bfe64da9c 100644
>--- a/Source/WebCore/Modules/webgpu/WHLSL/WHLSLChecker.cpp
>+++ b/Source/WebCore/Modules/webgpu/WHLSL/WHLSLChecker.cpp
>@@ -969,6 +969,29 @@ void Checker::visit(AST::MakeArrayReferenceExpression& makeArrayReferenceExpress
>     assignType(makeArrayReferenceExpression, makeUniqueRef<AST::ArrayReferenceType>(Lexer::Token(makeArrayReferenceExpression.origin()), *leftAddressSpace, leftValueType->clone()));
> }
> 
>+static Optional<UniqueRef<AST::UnnamedType>> argumentTypeForAndOverload(AST::UnnamedType& baseType, AST::AddressSpace addressSpace)
>+{
>+    auto& unifyNode = baseType.unifyNode();
>+    if (is<AST::NamedType>(unifyNode)) {
>+        auto& namedType = downcast<AST::NamedType>(unifyNode);
>+        return { makeUniqueRef<AST::PointerType>(Lexer::Token(namedType.origin()), addressSpace, AST::TypeReference::wrap(Lexer::Token(namedType.origin()), namedType)) };
>+    }
>+
>+    ASSERT(is<AST::UnnamedType>(unifyNode));
>+    auto& unnamedType = downcast<AST::UnnamedType>(unifyNode);
>+
>+    if (is<AST::ArrayReferenceType>(unnamedType))
>+        return unnamedType.clone();
>+
>+    if (is<AST::ArrayType>(unnamedType))
>+        return { makeUniqueRef<AST::ArrayReferenceType>(Lexer::Token(unnamedType.origin()), addressSpace, downcast<AST::ArrayType>(unnamedType).type().clone()) };
>+
>+    if (is<AST::PointerType>(unnamedType))
>+        return WTF::nullopt;
>+
>+    return { makeUniqueRef<AST::PointerType>(Lexer::Token(unnamedType.origin()), addressSpace, unnamedType.clone()) };
>+}
>+
> void Checker::finishVisiting(AST::PropertyAccessExpression& propertyAccessExpression, ResolvingType* additionalArgumentType)
> {
>     auto baseInfo = recurseAndGetInfo(propertyAccessExpression.base());
>@@ -992,17 +1015,19 @@ void Checker::finishVisiting(AST::PropertyAccessExpression& propertyAccessExpres
>     AST::UnnamedType* anderReturnType = nullptr;
>     auto leftAddressSpace = baseInfo->typeAnnotation.leftAddressSpace();
>     if (leftAddressSpace) {
>-        ResolvingType argumentType = { makeUniqueRef<AST::PointerType>(Lexer::Token(propertyAccessExpression.origin()), *leftAddressSpace, baseUnnamedType->get().clone()) };
>-        Vector<std::reference_wrapper<ResolvingType>> anderArgumentTypes { argumentType };
>-        if (additionalArgumentType)
>-            anderArgumentTypes.append(*additionalArgumentType);
>-        if ((anderFunction = resolveFunctionOverloadImpl(propertyAccessExpression.possibleAnderOverloads(), anderArgumentTypes, nullptr)))
>-            anderReturnType = &downcast<AST::PointerType>(anderFunction->type()).elementType(); // FIXME: https://bugs.webkit.org/show_bug.cgi?id=198164 Enforce the return of anders will always be a pointer
>+        if (auto argumentTypeForAndOverload = WHLSL::argumentTypeForAndOverload(*baseUnnamedType, *leftAddressSpace)) {
>+            ResolvingType argumentType = { WTFMove(*argumentTypeForAndOverload) };
>+            Vector<std::reference_wrapper<ResolvingType>> anderArgumentTypes { argumentType };
>+            if (additionalArgumentType)
>+                anderArgumentTypes.append(*additionalArgumentType);
>+            if ((anderFunction = resolveFunctionOverloadImpl(propertyAccessExpression.possibleAnderOverloads(), anderArgumentTypes, nullptr)))
>+                anderReturnType = &downcast<AST::PointerType>(anderFunction->type()).elementType(); // FIXME: https://bugs.webkit.org/show_bug.cgi?id=198164 Enforce the return of anders will always be a pointer
>+        }
>     }
> 
>     AST::FunctionDeclaration* threadAnderFunction = nullptr;
>     AST::UnnamedType* threadAnderReturnType = nullptr;
>-    {
>+    if (auto argumentTypeForAndOverload = WHLSL::argumentTypeForAndOverload(*baseUnnamedType, AST::AddressSpace::Thread)) {
>         ResolvingType argumentType = { makeUniqueRef<AST::PointerType>(Lexer::Token(propertyAccessExpression.origin()), AST::AddressSpace::Thread, baseUnnamedType->get().clone()) };
>         Vector<std::reference_wrapper<ResolvingType>> threadAnderArgumentTypes { argumentType };
>         if (additionalArgumentType)

Actions: View | Formatted Diff | Diff

Attachments on bug 198163: 370830 | 370874 | 370912 | 371158 | 371243 | 371373 | 371374 | 371375 | 371471 | 371475 | 371555 | 371900