Changeset 235249 in webkit

Timestamp:

Aug 23, 2018 2:43:03 PM (6 years ago)

Author:

mmaxfield@apple.com

Message:

[WSL] Ternary expressions appear to be unimplemented
​https://bugs.webkit.org/show_bug.cgi?id=178981

Reviewed by Saam Barati.

Implement ternary statements. These can be both lvalues and rvalues. (a ? b : c ? d : e)
is parsed as (a ? b : (c ? d : e)).

• WebGPUShadingLanguageRI/All.js:
• WebGPUShadingLanguageRI/Checker.js:

(Checker.prototype.visitTernaryExpression):

• WebGPUShadingLanguageRI/Evaluator.js:

(Evaluator.prototype.visitTernaryExpression):

• WebGPUShadingLanguageRI/NormalUsePropertyResolver.js:

(NormalUsePropertyResolver.prototype.visitTernaryExpression):
(NormalUsePropertyResolver):

• WebGPUShadingLanguageRI/Parse.js:

(parsePossibleTernaryConditional):

• WebGPUShadingLanguageRI/PropertyResolver.js:

(PropertyResolver.prototype._visitRValuesWithinLValue.RValueFinder.prototype.visitTernaryExpression):
(PropertyResolver.prototype._visitRValuesWithinLValue.RValueFinder):
(PropertyResolver.prototype._visitRValuesWithinLValue):

• WebGPUShadingLanguageRI/Rewriter.js:

(Rewriter.prototype.visitTernaryExpression):

• WebGPUShadingLanguageRI/SPIRV.html:
• WebGPUShadingLanguageRI/Test.html:
• WebGPUShadingLanguageRI/Test.js:
• WebGPUShadingLanguageRI/Visitor.js:

(Visitor.prototype.visitProtocolDecl):

• WebGPUShadingLanguageRI/index.html:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebGPUShadingLanguageRI/All.js (modified) (1 diff)
• WebGPUShadingLanguageRI/Checker.js (modified) (1 diff)
• WebGPUShadingLanguageRI/Evaluator.js (modified) (1 diff)
• WebGPUShadingLanguageRI/NormalUsePropertyResolver.js (modified) (1 diff)
• WebGPUShadingLanguageRI/Parse.js (modified) (1 diff)
• WebGPUShadingLanguageRI/PropertyResolver.js (modified) (1 diff)
• WebGPUShadingLanguageRI/Rewriter.js (modified) (1 diff)
• WebGPUShadingLanguageRI/SPIRV.html (modified) (1 diff)
• WebGPUShadingLanguageRI/TernaryExpression.js (copied) (copied from trunk/Tools/WebGPUShadingLanguageRI/NormalUsePropertyResolver.js) (2 diffs)
• WebGPUShadingLanguageRI/Test.html (modified) (1 diff)
• WebGPUShadingLanguageRI/Test.js (modified) (1 diff)
• WebGPUShadingLanguageRI/Visitor.js (modified) (1 diff)
• WebGPUShadingLanguageRI/index.html (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-08-23  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [WSL] Ternary expressions appear to be unimplemented
+        https://bugs.webkit.org/show_bug.cgi?id=178981
+
+        Reviewed by Saam Barati.
+
+        Implement ternary statements. These can be both lvalues and rvalues. (a ? b : c ? d : e)
+        is parsed as (a ? b : (c ? d : e)).
+
+        * WebGPUShadingLanguageRI/All.js:
+        * WebGPUShadingLanguageRI/Checker.js:
+        (Checker.prototype.visitTernaryExpression):
+        * WebGPUShadingLanguageRI/Evaluator.js:
+        (Evaluator.prototype.visitTernaryExpression):
+        * WebGPUShadingLanguageRI/NormalUsePropertyResolver.js:
+        (NormalUsePropertyResolver.prototype.visitTernaryExpression):
+        (NormalUsePropertyResolver):
+        * WebGPUShadingLanguageRI/Parse.js:
+        (parsePossibleTernaryConditional):
+        * WebGPUShadingLanguageRI/PropertyResolver.js:
+        (PropertyResolver.prototype._visitRValuesWithinLValue.RValueFinder.prototype.visitTernaryExpression):
+        (PropertyResolver.prototype._visitRValuesWithinLValue.RValueFinder):
+        (PropertyResolver.prototype._visitRValuesWithinLValue):
+        * WebGPUShadingLanguageRI/Rewriter.js:
+        (Rewriter.prototype.visitTernaryExpression):
+        * WebGPUShadingLanguageRI/SPIRV.html:
+        * WebGPUShadingLanguageRI/Test.html:
+        * WebGPUShadingLanguageRI/Test.js:
+        * WebGPUShadingLanguageRI/Visitor.js:
+        (Visitor.prototype.visitProtocolDecl):
+        * WebGPUShadingLanguageRI/index.html:
+
 2018-08-22  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Tools/WebGPUShadingLanguageRI/All.js

@@ -154 +154 @@
 load("SynthesizeCopyConstructorOperator.js");
 load("SynthesizeDefaultConstructorOperator.js");
+load("TernaryExpression.js");
 load("TrapStatement.js");
 load("TypeDef.js");

trunk/Tools/WebGPUShadingLanguageRI/Checker.js

@@ -649 +649 @@
         return result;
     }
+
+    visitTernaryExpression(node)
+    {
+        this._requireBool(node.predicate);
+        let bodyType = node.bodyExpression.visit(this);
+        let elseType = node.elseExpression.visit(this);
+        if (!bodyType)
+            throw new Error("Ternary expression body has no type: " + node.bodyExpression);
+        if (!elseType)
+            throw new Error("Ternary expression else has no type: " + node.elseExpression);
+        if (!bodyType.equalsWithCommit(elseType))
+            throw new WTypeError("Body and else clause of ternary statement don't have the same type: " + node);
+        node.isLValue = node.bodyExpression.isLValue && node.elseExpression.isLValue;
+        return bodyType;
+    }
     
     visitCallExpression(node)

trunk/Tools/WebGPUShadingLanguageRI/Evaluator.js

@@ -143 +143 @@
         return result;
     }
+
+    visitTernaryExpression(node)
+    {
+        if (node.predicate.visit(this).loadValue())
+            return node.bodyExpression.visit(this);
+        return node.elseExpression.visit(this);
+        
+    }
     
     visitVariableRef(node)

trunk/Tools/WebGPUShadingLanguageRI/NormalUsePropertyResolver.js

@@ -35 +35 @@
         return super.visitIndexExpression(node).rewriteAfterCloning();
     }
+
+    visitTernaryExpression(node)
+    {
+        let result = super.visitTernaryExpression(node);
+        result.isLValue = node.isLValue;
+        return result;
+    }
 }
 

trunk/Tools/WebGPUShadingLanguageRI/Parse.js

@@ -521 +521 @@
         if (!operator)
             return predicate;
-        return new TernaryExpression(operator, predicate, parsePossibleAssignment(), parsePossibleAssignment());
+        let bodyExpression = parsePossibleAssignment();
+        consume(":");
+        let elseExpression = parsePossibleAssignment();
+        return new TernaryExpression(operator, predicate, bodyExpression, elseExpression);
     }
     

trunk/Tools/WebGPUShadingLanguageRI/PropertyResolver.js

@@ -59 +59 @@
             {
                 visit(node.lValue);
+            }
+
+            visitTernaryExpression(node)
+            {
             }
         }

trunk/Tools/WebGPUShadingLanguageRI/Rewriter.js

@@ -165 +165 @@
         return result;
     }
+
+    visitTernaryExpression(node)
+    {
+        return new TernaryExpression(node.origin, node.predicate.visit(this), node.bodyExpression.visit(this), node.elseExpression.visit(this));
+    }
     
     _handlePropertyAccessExpression(result, node)

trunk/Tools/WebGPUShadingLanguageRI/SPIRV.html

@@ -137 +137 @@
     <script src="SynthesizeCopyConstructorOperator.js"></script>
     <script src="SynthesizeDefaultConstructorOperator.js"></script>
+    <script src="TernaryExpression.js"></script>
     <script src="TrapStatement.js"></script>
     <script src="TypeDef.js"></script>

trunk/Tools/WebGPUShadingLanguageRI/TernaryExpression.js

@@ -1 +1 @@
 /*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2018 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25 +25 @@
 "use strict";
 
-class NormalUsePropertyResolver extends Rewriter {
-    visitDotExpression(node)
+class TernaryExpression extends Expression {
+    constructor(origin, predicate, bodyExpression, elseExpression)
     {
-        return super.visitDotExpression(node).rewriteAfterCloning();
+        super(origin);
+        this._predicate = predicate;
+        this._bodyExpression = bodyExpression;
+        this._elseExpression = elseExpression;
+        this._isLValue = null; // We use null to indicate that we don't know yet.
     }
     
-    visitIndexExpression(node)
+    get predicate() { return this._predicate; }
+    get bodyExpression() { return this._bodyExpression; }
+    get elseExpression() { return this._elseExpression; }
+    get isLValue() { return this._isLValue; }
+    set isLValue(value) { this._isLValue = value; }
+    
+    toString()
     {
-        return super.visitIndexExpression(node).rewriteAfterCloning();
+        return "(" + this.predicate + ") ? (" + this.bodyExpression + ") : (" + this.elseExpression + ")";
     }
 }
-

trunk/Tools/WebGPUShadingLanguageRI/Test.html

@@ -131 +131 @@
 <script src="SynthesizeCopyConstructorOperator.js"></script>
 <script src="SynthesizeDefaultConstructorOperator.js"></script>
+<script src="TernaryExpression.js"></script>
 <script src="TrapStatement.js"></script>
 <script src="TypeDef.js"></script>

trunk/Tools/WebGPUShadingLanguageRI/Test.js

@@ -197 +197 @@
         `),
         (e) => e instanceof WSyntaxError);
+}
+
+tests.ternaryExpression = function() {
+    let program = doPrep(`
+        int foo(int x)
+        {
+            return x < 3 ? 4 : 5;
+        }
+        int bar(int x)
+        {
+            int y = 1;
+            int z = 2;
+            (x < 3 ? y : z) = 7;
+            return y;
+        }
+        int baz(int x)
+        {
+            return x < 10 ? 11 : x < 12 ? 14 : 15;
+        }
+        int quux(int x)
+        {
+            return 3 < 4 ? x : 5;
+        }
+    `);
+    checkInt(program, callFunction(program, "foo", [], [makeInt(program, 767)]), 5);
+    checkInt(program, callFunction(program, "foo", [], [makeInt(program, 2)]), 4);
+    checkInt(program, callFunction(program, "bar", [], [makeInt(program, 2)]), 7);
+    checkInt(program, callFunction(program, "bar", [], [makeInt(program, 8)]), 1);
+    checkInt(program, callFunction(program, "baz", [], [makeInt(program, 8)]), 11);
+    checkInt(program, callFunction(program, "baz", [], [makeInt(program, 9)]), 11);
+    checkInt(program, callFunction(program, "baz", [], [makeInt(program, 10)]), 14);
+    checkInt(program, callFunction(program, "baz", [], [makeInt(program, 11)]), 14);
+    checkInt(program, callFunction(program, "baz", [], [makeInt(program, 12)]), 15);
+    checkInt(program, callFunction(program, "baz", [], [makeInt(program, 13)]), 15);
+    checkInt(program, callFunction(program, "quux", [], [makeInt(program, 14)]), 14);
+    checkFail(
+        () => doPrep(`
+            int foo()
+            {
+                int x;
+                (4 < 5 ? x : 7) = 8;
+            }
+        `),
+        (e) => e instanceof WTypeError);
+    checkFail(
+        () => doPrep(`
+            int foo()
+            {
+                int x;
+                float y;
+                return 4 < 5 ? x : y;
+            }
+        `),
+        (e) => e instanceof WTypeError);
+    checkFail(
+        () => doPrep(`
+            int foo()
+            {
+                return 4 < 5 ? 6 : 7.0;
+            }
+        `),
+        (e) => e instanceof WTypeError);
 }
 

trunk/Tools/WebGPUShadingLanguageRI/Visitor.js

@@ -163 +163 @@
         node.ptr.visit(this);
     }
+
+    visitTernaryExpression(node)
+    {
+        node.predicate.visit(this);
+        node.bodyExpression.visit(this);
+        node.elseExpression.visit(this);
+    }
     
     _handlePropertyAccessExpression(node)

trunk/Tools/WebGPUShadingLanguageRI/index.html

@@ -131 +131 @@
 <script src="SynthesizeCopyConstructorOperator.js"></script>
 <script src="SynthesizeDefaultConstructorOperator.js"></script>
+<script src="TernaryExpression.js"></script>
 <script src="TrapStatement.js"></script>
 <script src="TypeDef.js"></script>