Changeset 234001 in webkit

Timestamp:

Jul 19, 2018 1:42:20 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[WHLSL] The interpreter doesn't support boolean short-circuiting
​https://bugs.webkit.org/show_bug.cgi?id=187779

Patch by Thomas Denney <​tdenney@apple.com> on 2018-07-19
Reviewed by Alex Christensen.

• WebGPUShadingLanguageRI/Evaluator.js:

(Evaluator.prototype.visitLogicalExpression): RHS is only evaluated when necessary

• WebGPUShadingLanguageRI/Test.js:

(tests.booleanShortcircuiting): Adds 4 tests for the evaluation of logical expresions

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebGPUShadingLanguageRI/Evaluator.js (modified) (1 diff)
• WebGPUShadingLanguageRI/Test.js (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-07-19  Thomas Denney  <tdenney@apple.com>
+
+        [WHLSL] The interpreter doesn't support boolean short-circuiting
+        https://bugs.webkit.org/show_bug.cgi?id=187779
+
+        Reviewed by Alex Christensen.
+
+        * WebGPUShadingLanguageRI/Evaluator.js:
+        (Evaluator.prototype.visitLogicalExpression): RHS is only evaluated when necessary
+        * WebGPUShadingLanguageRI/Test.js:
+        (tests.booleanShortcircuiting): Adds 4 tests for the evaluation of logical expresions
+
 2018-07-19  Dean Jackson  <dino@apple.com>
 

trunk/Tools/WebGPUShadingLanguageRI/Evaluator.js

@@ -178 +178 @@
     {
         let lhs = node.left.visit(this).loadValue();
-        let rhs = node.right.visit(this).loadValue();
         let result;
         switch (node.text) {
         case "&&":
-            result = lhs && rhs;
+            result = lhs && node.right.visit(this).loadValue();
             break;
         case "||":
-            result = lhs || rhs;
+            result = lhs || node.right.visit(this).loadValue();
             break;
         default:

trunk/Tools/WebGPUShadingLanguageRI/Test.js

@@ -3825 +3825 @@
 }
 
+tests.booleanShortcircuiting = function()
+{
+    let program = doPrep(`
+        bool set(thread int* ptr, int value, bool retValue) 
+        { 
+            *ptr = value; 
+            return retValue; 
+        }
+        
+        int andTrue()
+        {
+            int x;
+            bool y = set(&x, 1, true) && set(&x, 2, false);
+            return x; 
+        }
+        
+        int andFalse()
+        {
+            int x;
+            bool y = set(&x, 1, false) && set(&x, 2, false);
+            return x; 
+        }
+        
+        int orTrue()
+        {
+            int x;
+            bool y = set(&x, 1, true) || set(&x, 2, false);
+            return x; 
+        }
+        
+        int orFalse()
+        {
+            int x;
+            bool y = set(&x, 1, false) || set(&x, 2, false);
+            return x; 
+        }
+    `);
+
+    checkInt(program, callFunction(program, "andTrue", [], []), 2);
+    checkInt(program, callFunction(program, "andFalse", [], []), 1);
+    checkInt(program, callFunction(program, "orTrue", [], []), 1);
+    checkInt(program, callFunction(program, "orFalse", [], []), 2);
+}
+
 tests.typedefArray = function()
 {