commit edb7aa70fcf375f77305528e5daa5696a31506d8
author Brian Salomon <bsalomon@google.com> Thu May 20 12:58:37 2021 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu May 20 12:58:46 2021 +0000
tree 6b2c55042abf48a0758fd9c281f7ba4eb405448c
parent 1f193df9b393d50da39570dab77a0bb5d28ec8ef

Revert "Add support for do-while loops in PipelineStage."

This reverts commit 9c7e04cd6f372c100e7a46d86a8841dff0d368fa.

Reason for revert: ANGLE bots don't like it:
https://logs.chromium.org/logs/skia/53a05ed157eb6c11/+/steps/dm/0/stdout
Exception in SkSLDeadReturnES3_GPU

Original change's description:
> Add support for do-while loops in PipelineStage.
>
> This allows us to run tests which use do-while loops (like
> DeadReturnES3) within dm.
>
> Change-Id: If8ecb6b3fcd23d79451a43edf8e1ee8a182de984
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/410459
> Commit-Queue: John Stiles <johnstiles@google.com>
> Auto-Submit: John Stiles <johnstiles@google.com>
> Reviewed-by: Brian Osman <brianosman@google.com>

TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com

Change-Id: Ib8ca1fd28b49c5e7d72290132336252218caac18
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/410779
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/sksl/codegen/SkSLPipelineStageCodeGenerator.cpp

diff --git a/src/sksl/codegen/SkSLPipelineStageCodeGenerator.cpp b/src/sksl/codegen/SkSLPipelineStageCodeGenerator.cpp
index 0f1fe1c..e555c4f 100644
--- a/src/sksl/codegen/SkSLPipelineStageCodeGenerator.cpp
+++ b/src/sksl/codegen/SkSLPipelineStageCodeGenerator.cpp
@@ -14,7 +14,6 @@
 #include "src/sksl/SkSLStringStream.h"
 #include "src/sksl/ir/SkSLBinaryExpression.h"
 #include "src/sksl/ir/SkSLConstructor.h"
-#include "src/sksl/ir/SkSLDoStatement.h"
 #include "src/sksl/ir/SkSLExpressionStatement.h"
 #include "src/sksl/ir/SkSLFieldAccess.h"
 #include "src/sksl/ir/SkSLForStatement.h"
@@ -89,7 +88,6 @@
     void writeStatement(const Statement& s);
     void writeBlock(const Block& b);
     void writeIfStatement(const IfStatement& stmt);
-    void writeDoStatement(const DoStatement& d);
     void writeForStatement(const ForStatement& f);
     void writeReturnStatement(const ReturnStatement& r);
 
@@ -593,9 +591,6 @@
             this->writeExpression(*s.as<ExpressionStatement>().expression(), Precedence::kTopLevel);
             this->write(";");
             break;
-        case Statement::Kind::kDo:
-            this->writeDoStatement(s.as<DoStatement>());
-            break;
         case Statement::Kind::kFor:
             this->writeForStatement(s.as<ForStatement>());
             break;
@@ -609,6 +604,7 @@
             this->writeVarDeclaration(s.as<VarDeclaration>());
             break;
         case Statement::Kind::kDiscard:
+        case Statement::Kind::kDo:
         case Statement::Kind::kSwitch:
             SkDEBUGFAIL("Unsupported control flow");
             break;
@@ -640,25 +636,7 @@
     }
 }
 
-void PipelineStageCodeGenerator::writeDoStatement(const DoStatement& d) {
-    this->write("do ");
-    this->writeStatement(*d.statement());
-    this->write(" while (");
-    this->writeExpression(*d.test(), Precedence::kTopLevel);
-    this->write(");");
-    return;
-}
-
 void PipelineStageCodeGenerator::writeForStatement(const ForStatement& f) {
-    // Emit loops of the form 'for(;test;)' as 'while(test)', which is probably how they started
-    if (!f.initializer() && f.test() && !f.next()) {
-        this->write("while (");
-        this->writeExpression(*f.test(), Precedence::kTopLevel);
-        this->write(") ");
-        this->writeStatement(*f.statement());
-        return;
-    }
-
     this->write("for (");
     if (f.initializer() && !f.initializer()->isEmpty()) {
         this->writeStatement(*f.initializer());

tests/SkSLTest.cpp

diff --git a/tests/SkSLTest.cpp b/tests/SkSLTest.cpp
index 8fd1015..d64ea14 100644
--- a/tests/SkSLTest.cpp
+++ b/tests/SkSLTest.cpp
@@ -229,7 +229,6 @@
 SKSL_TEST(SkSLConstVariableComparison,         "shared/ConstVariableComparison.sksl")
 SKSL_TEST(SkSLDeadIfStatement,                 "shared/DeadIfStatement.sksl")
 SKSL_TEST(SkSLDeadReturn,                      "shared/DeadReturn.sksl")
-SKSL_TEST_ES3(SkSLDeadReturnES3,               "shared/DeadReturnES3.sksl")
 SKSL_TEST(SkSLDeadStripFunctions,              "shared/DeadStripFunctions.sksl")
 SKSL_TEST(SkSLDependentInitializers,           "shared/DependentInitializers.sksl")
 SKSL_TEST(SkSLEmptyBlocksES2,                  "shared/EmptyBlocksES2.sksl")