Attachment 359140 Details for Bug 193437 – Patch

[patch] Patch

bug-193437-20190114233610.patch (text/plain), 17.29 KB, created by Myles C. Maxfield on 2019-01-14 23:36:11 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Myles C. Maxfield

Created: 2019-01-14 23:36:11 PST

Size: 17.29 KB

patch

obsolete

>Subversion Revision: 239975
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index ad82af58c5fd3b6a1c8e97b7f0eaaaa39abe0f86..1a291d52426f4801476cf4a346cf844cf24f31e8 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,24 @@
>+2019-01-14  Myles C. Maxfield  <mmaxfield@apple.com>
>+
>+        [WHLSL] Implement the return checker
>+        https://bugs.webkit.org/show_bug.cgi?id=193437
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This is a translation of https://github.com/gpuweb/WHLSL/blob/master/Source/RecursionChecker.mjs into C++.
>+
>+        No new tests because it isn't hooked up yet. Not enough of the compiler exists to have any meaningful sort
>+        of test. When enough of the compiler is present, I'll port the reference implementation's test suite.
>+
>+        * Modules/webgpu/WHLSL/WHLSLReturnChecker.cpp: Added.
>+        (WebCore::WHLSL::ReturnChecker::ReturnChecker):
>+        (WebCore::WHLSL::ReturnChecker::mergeReturnStyle):
>+        (WebCore::WHLSL::ReturnChecker::isBoolCastFromLiteralTrue):
>+        (WebCore::WHLSL::checkReturns):
>+        * Modules/webgpu/WHLSL/WHLSLReturnChecker.h: Added.
>+        * Sources.txt:
>+        * WebCore.xcodeproj/project.pbxproj:
>+
> 2019-01-14  Myles C. Maxfield  <mmaxfield@apple.com>
> 
>         [WHLSL] Implement the Type Checker
>diff --git a/Source/WebCore/Modules/webgpu/WHLSL/WHLSLReturnChecker.cpp b/Source/WebCore/Modules/webgpu/WHLSL/WHLSLReturnChecker.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..17c74675fb3871571c9022a6e9f13b18d646f6b6
>--- /dev/null
>+++ b/Source/WebCore/Modules/webgpu/WHLSL/WHLSLReturnChecker.cpp
>@@ -0,0 +1,266 @@
>+/*
>+ * Copyright (C) 2019 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#include "config.h"
>+#include "WHLSLReturnChecker.h"
>+
>+#if ENABLE(WEBGPU)
>+
>+#include "WHLSLCallExpression.h"
>+#include "WHLSLDoWhileLoop.h"
>+#include "WHLSLForLoop.h"
>+#include "WHLSLIfStatement.h"
>+#include "WHLSLIntrinsics.h"
>+#include "WHLSLProgram.h"
>+#include "WHLSLSwitchStatement.h"
>+#include "WHLSLVisitor.h"
>+#include "WHLSLWhileLoop.h"
>+#include <wtf/Vector.h>
>+
>+namespace WebCore {
>+
>+namespace WHLSL {
>+
>+class ReturnChecker : public Visitor {
>+public:
>+    ReturnChecker(Intrinsics& intrinsics)
>+        : m_intrinsics(intrinsics)
>+    {
>+    }
>+
>+    virtual ~ReturnChecker() = default;
>+
>+private:
>+    enum class ReturnStyle {
>+        DefinitelyReturns,
>+        DefinitelyDoesntReturn,
>+        HasntReturnedYet
>+    };
>+
>+    ReturnStyle mergeReturnStyle(ReturnStyle a, ReturnStyle b)
>+    {
>+        switch (a) {
>+        case ReturnStyle::DefinitelyReturns:
>+        case ReturnStyle::DefinitelyDoesntReturn:
>+            if (a == b)
>+                return a;
>+            return ReturnStyle::HasntReturnedYet;
>+        case ReturnStyle::HasntReturnedYet:
>+            return ReturnStyle::HasntReturnedYet;
>+        }
>+    }
>+
>+    bool isBoolCastFromLiteralTrue(AST::Expression& expression)
>+    {
>+        if (!is<AST::CallExpression>(expression))
>+            return false;
>+        auto& callExpression = downcast<AST::CallExpression>(expression);
>+        if (!callExpression.isCast())
>+            return false;
>+        if (!matches(*callExpression.castReturnType(), m_intrinsics.boolType()))
>+            return false;
>+        if (callExpression.arguments().size() != 1)
>+            return false;
>+        auto& argument = static_cast<AST::Expression&>(callExpression.arguments()[0]);
>+        if (!is<AST::BooleanLiteral>(argument))
>+            return false;
>+        auto& booleanLiteral = downcast<AST::BooleanLiteral>(argument);
>+        return booleanLiteral.value();
>+    }
>+
>+    void visit(AST::FunctionDefinition& functionDefinition) override
>+    {
>+        if (matches(functionDefinition.type(), m_intrinsics.voidType()))
>+            return;
>+
>+        checkErrorAndVisit(functionDefinition.block());
>+        if (error())
>+            return;
>+        ASSERT(m_stack.size() == 1);
>+        auto bodyValue = m_stack.last();
>+        if (bodyValue == ReturnStyle::DefinitelyDoesntReturn || bodyValue == ReturnStyle::HasntReturnedYet)
>+            setError();
>+    }
>+
>+    void visit(AST::Block& block) override
>+    {
>+        for (auto& statement : block.statements()) {
>+            checkErrorAndVisit(statement);
>+            switch (m_stack.takeLast()) {
>+            case ReturnStyle::DefinitelyReturns:
>+                m_stack.append(ReturnStyle::DefinitelyReturns);
>+                return;
>+            case ReturnStyle::DefinitelyDoesntReturn:
>+                m_stack.append(ReturnStyle::DefinitelyDoesntReturn);
>+                return;
>+            case ReturnStyle::HasntReturnedYet:
>+                continue;
>+            }
>+        }
>+        m_stack.append(ReturnStyle::HasntReturnedYet);
>+    }
>+
>+    void visit(AST::Break&) override
>+    {
>+        m_stack.append(ReturnStyle::DefinitelyDoesntReturn);
>+    }
>+
>+    void visit(AST::Continue&) override
>+    {
>+        // FIXME: This seems wrong. Consider a loop like:
>+        //
>+        // int foo() { for (;;) { continue; } }
>+        //
>+        // This program shouldn't claim that the problem is that it doesn't return.
>+        // https://bugs.webkit.org/show_bug.cgi?id=177172
>+        m_stack.append(ReturnStyle::DefinitelyDoesntReturn);
>+    }
>+
>+    void visit(AST::DoWhileLoop& doWhileLoop) override
>+    {
>+        checkErrorAndVisit(doWhileLoop.body());
>+        if (m_stack.takeLast() == ReturnStyle::DefinitelyReturns) {
>+            m_stack.append(ReturnStyle::DefinitelyReturns);
>+            return;
>+        }
>+        m_stack.append(ReturnStyle::HasntReturnedYet);
>+    }
>+
>+    void visit(AST::Fallthrough&) override
>+    {
>+        // FIXME: Make sure this is right
>+        m_stack.append(ReturnStyle::DefinitelyDoesntReturn);
>+    }
>+
>+    void visit(AST::ForLoop& forLoop) override
>+    {
>+        checkErrorAndVisit(forLoop.body());
>+        auto bodyReturn = m_stack.takeLast();
>+        if (!forLoop.condition() || isBoolCastFromLiteralTrue(*forLoop.condition())) {
>+            switch (bodyReturn) {
>+            case ReturnStyle::DefinitelyReturns:
>+                m_stack.append(ReturnStyle::DefinitelyReturns);
>+                return;
>+            case ReturnStyle::DefinitelyDoesntReturn:
>+            case ReturnStyle::HasntReturnedYet:
>+                m_stack.append(ReturnStyle::HasntReturnedYet);
>+                return;
>+            }
>+        }
>+        m_stack.append(ReturnStyle::HasntReturnedYet);
>+    }
>+
>+    void visit(AST::IfStatement& ifStatement) override
>+    {
>+        if (ifStatement.elseBody()) {
>+            checkErrorAndVisit(ifStatement.body());
>+            auto bodyValue = m_stack.takeLast();
>+            checkErrorAndVisit(*ifStatement.elseBody());
>+            auto elseValue = m_stack.takeLast();
>+            m_stack.append(mergeReturnStyle(bodyValue, elseValue));
>+        }
>+        m_stack.append(ReturnStyle::HasntReturnedYet);
>+    }
>+
>+    void visit(AST::Return&) override
>+    {
>+        m_stack.append(ReturnStyle::DefinitelyReturns);
>+    }
>+
>+    void visit(AST::SwitchStatement& switchStatement) override
>+    {
>+        // FIXME: This seems like it's missing things. For example, we need to be smart about this:
>+        //
>+        // for (;;) {
>+        //     switch (...) {
>+        //     ...
>+        //         continue; // This continues the for loop
>+        //     }
>+        // }
>+        //
>+        // I'm not sure what that means for this analysis. I'm starting to think that the right way to
>+        // build this analysis is to run a visitor that builds a CFG and then analyze the CFG.
>+        // https://bugs.webkit.org/show_bug.cgi?id=177172
>+
>+        Optional<ReturnStyle> returnStyle;
>+        for (auto& switchCase : switchStatement.switchCases()) {
>+            checkErrorAndVisit(switchCase.block());
>+            auto bodyStyle = m_stack.takeLast();
>+            // FIXME: The fact that we need this demonstrates the need for CFG analysis.
>+            if (bodyStyle == ReturnStyle::DefinitelyDoesntReturn)
>+                bodyStyle = ReturnStyle::HasntReturnedYet;
>+            if (returnStyle)
>+                returnStyle = mergeReturnStyle(*returnStyle, bodyStyle);
>+            else
>+                returnStyle = bodyStyle;
>+        }
>+        ASSERT(returnStyle);
>+        m_stack.append(*returnStyle);
>+    }
>+
>+    void visit(AST::Trap&) override
>+    {
>+        m_stack.append(ReturnStyle::DefinitelyReturns);
>+    }
>+
>+    void visit(AST::VariableDeclarationsStatement&) override
>+    {
>+        m_stack.append(ReturnStyle::HasntReturnedYet);
>+    }
>+
>+    void visit(AST::WhileLoop& whileLoop) override
>+    {
>+        checkErrorAndVisit(whileLoop.body());
>+        auto bodyReturn = m_stack.takeLast();
>+        if (isBoolCastFromLiteralTrue(whileLoop.conditional())) {
>+            switch (bodyReturn) {
>+            case ReturnStyle::DefinitelyReturns:
>+                m_stack.append(ReturnStyle::DefinitelyReturns);
>+                return;
>+            case ReturnStyle::DefinitelyDoesntReturn:
>+            case ReturnStyle::HasntReturnedYet:
>+                m_stack.append(ReturnStyle::HasntReturnedYet);
>+                return;
>+            }
>+        }
>+        m_stack.append(ReturnStyle::HasntReturnedYet);
>+    }
>+
>+    Intrinsics& m_intrinsics;
>+    Vector<ReturnStyle> m_stack;
>+};
>+
>+bool checkReturns(Program& program)
>+{
>+    ReturnChecker returnChecker(program.intrinsics());
>+    returnChecker.Visitor::visit(program);
>+    return !returnChecker.error();
>+}
>+
>+}
>+
>+}
>+
>+#endif
>diff --git a/Source/WebCore/Modules/webgpu/WHLSL/WHLSLReturnChecker.h b/Source/WebCore/Modules/webgpu/WHLSL/WHLSLReturnChecker.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..6f82371026e879b218b58d85dda5c155a25e8733
>--- /dev/null
>+++ b/Source/WebCore/Modules/webgpu/WHLSL/WHLSLReturnChecker.h
>@@ -0,0 +1,42 @@
>+/*
>+ * Copyright (C) 2019 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#pragma once
>+
>+#if ENABLE(WEBGPU)
>+
>+namespace WebCore {
>+
>+namespace WHLSL {
>+
>+class Program;
>+
>+bool checkReturns(Program&);
>+
>+}
>+
>+}
>+
>+#endif
>diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt
>index 63f09611b682c18942163422f8cf035bb4280906..18bf8e58cfe2bec895800a2365013f4ac112c54b 100644
>--- a/Source/WebCore/Sources.txt
>+++ b/Source/WebCore/Sources.txt
>@@ -321,6 +321,7 @@ Modules/webgpu/WHLSL/WHLSLIntrinsics.cpp
> Modules/webgpu/WHLSL/WHLSLNameContext.cpp
> Modules/webgpu/WHLSL/WHLSLNameResolver.cpp
> Modules/webgpu/WHLSL/WHLSLResolveOverloadImpl.cpp
>+Modules/webgpu/WHLSL/WHLSLReturnChecker.cpp
> Modules/webgpu/WHLSL/WHLSLVisitor.cpp
> Modules/webgpu/WHLSL/AST/WHLSLTypeArgument.cpp
> Modules/webgpu/WHLSL/AST/WHLSLBuiltInSemantic.cpp
>diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>index 93a4a531cf43a399372cb887b1ce69d9f5026b8b..deafd2bc588568783ee1f32af38d07341e328bb5 100644
>--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>@@ -6413,14 +6413,16 @@
> 		1C66260F1C6E7CA600AB527C /* FontFace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontFace.h; sourceTree = "<group>"; };
> 		1C81B9560E97330800266E07 /* InspectorController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorController.h; sourceTree = "<group>"; };
> 		1C81B9570E97330800266E07 /* InspectorController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorController.cpp; sourceTree = "<group>"; };
>+		1C81B9580E97330800266E07 /* InspectorClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorClient.h; sourceTree = "<group>"; };
>+		1C840B7D21EBE0B800D0500D /* WHLSLEntryPointType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WHLSLEntryPointType.h; sourceTree = "<group>"; };
>+		1C840B9021EC30F900D0500D /* WHLSLAddressSpace.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WHLSLAddressSpace.h; sourceTree = "<group>"; };
> 		1C840B9721EC400700D0500D /* WHLSLChecker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WHLSLChecker.h; sourceTree = "<group>"; };
> 		1C840B9921EC400800D0500D /* WHLSLGatherEntryPointItems.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WHLSLGatherEntryPointItems.cpp; sourceTree = "<group>"; };
> 		1C840B9A21EC400900D0500D /* WHLSLGatherEntryPointItems.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WHLSLGatherEntryPointItems.h; sourceTree = "<group>"; };
> 		1C840B9B21EC400900D0500D /* WHLSLChecker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WHLSLChecker.cpp; sourceTree = "<group>"; };
>-		1C81B9580E97330800266E07 /* InspectorClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorClient.h; sourceTree = "<group>"; };
>-		1C840B7D21EBE0B800D0500D /* WHLSLEntryPointType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WHLSLEntryPointType.h; sourceTree = "<group>"; };
>-		1C840B9021EC30F900D0500D /* WHLSLAddressSpace.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WHLSLAddressSpace.h; sourceTree = "<group>"; };
> 		1C904DF90BA9D2C80081E9D0 /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
>+		1C9AE5DE21EDB8440069D5F2 /* WHLSLReturnChecker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WHLSLReturnChecker.cpp; sourceTree = "<group>"; };
>+		1C9AE5DF21EDB8440069D5F2 /* WHLSLReturnChecker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WHLSLReturnChecker.h; sourceTree = "<group>"; };
> 		1CA19E030DC255950065A994 /* EventLoopMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = EventLoopMac.mm; sourceTree = "<group>"; };
> 		1CA19E150DC255CA0065A994 /* EventLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventLoop.h; sourceTree = "<group>"; };
> 		1CAF347E0A6C405200ABE06E /* WebScriptObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebScriptObject.h; sourceTree = "<group>"; };
>@@ -25442,6 +25444,8 @@
> 				C234A99921E90F29003C984D /* WHLSLResolveOverloadImpl.cpp */,
> 				C234A99721E90F28003C984D /* WHLSLResolveOverloadImpl.h */,
> 				C234A99D21E910BD003C984D /* WHLSLResolvingType.h */,
>+				1C9AE5DE21EDB8440069D5F2 /* WHLSLReturnChecker.cpp */,
>+				1C9AE5DF21EDB8440069D5F2 /* WHLSLReturnChecker.h */,
> 				C21BF74521CD969800227979 /* WHLSLStandardLibrary.txt */,
> 				C234A9A921E92C17003C984D /* WHLSLSynthesizeArrayOperatorLength.cpp */,
> 				C234A9AF21E92C1B003C984D /* WHLSLSynthesizeArrayOperatorLength.h */,

Actions: View | Formatted Diff | Diff

Attachments on bug 193437: 359140 | 359142