aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/sksl/ir/SkSLBlock.h
diff options
context:
space:
mode:
authorGravatar Ethan Nicholas <ethannicholas@google.com>2017-02-06 18:53:07 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-02-06 19:25:13 +0000
commite1d9cb82bf9004eb05831f34bb3e9e708ae0617f (patch)
tree51bab2d2dbd178e95d4906e06fd294254a33106e /src/sksl/ir/SkSLBlock.h
parenta84898dbb8d8f7cb8c3e9bdfb4c31d85dff1922f (diff)
Revert "Added dead variable / code elimination to skslc."
This reverts commit 113628d76176a1ab3e6719c59efff23cd10ab213. Reason for revert: Looks to have caused https://bugs.chromium.org/p/chromium/issues/detail?id=688939 Original change's description: > Added dead variable / code elimination to skslc. > > BUG=skia: > > Change-Id: Ib037730803a8f222f099de0e001fe06ad452a22c > Reviewed-on: https://skia-review.googlesource.com/7584 > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Reviewed-by: Ben Wagner <benjaminwagner@google.com> > TBR=egdaniel@google.com,benjaminwagner@google.com,ethannicholas@google.com,reviews@skia.org # Not skipping CQ checks because original CL landed > 1 day ago. BUG=skia: Change-Id: I85599e4ca2bc6bfd782edc163f67b64195d6ae65 Reviewed-on: https://skia-review.googlesource.com/8077 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/ir/SkSLBlock.h')
-rw-r--r--src/sksl/ir/SkSLBlock.h11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/sksl/ir/SkSLBlock.h b/src/sksl/ir/SkSLBlock.h
index f00c146725..17970fd561 100644
--- a/src/sksl/ir/SkSLBlock.h
+++ b/src/sksl/ir/SkSLBlock.h
@@ -23,15 +23,6 @@ struct Block : public Statement {
, fSymbols(std::move(symbols))
, fStatements(std::move(statements)) {}
- virtual bool isEmpty() const override {
- for (const auto& s : fStatements) {
- if (!s->isEmpty()) {
- return false;
- }
- }
- return true;
- }
-
SkString description() const override {
SkString result("{");
for (size_t i = 0; i < fStatements.size(); i++) {
@@ -45,7 +36,7 @@ struct Block : public Statement {
// it's important to keep fStatements defined after (and thus destroyed before) fSymbols,
// because destroying statements can modify reference counts in symbols
const std::shared_ptr<SymbolTable> fSymbols;
- std::vector<std::unique_ptr<Statement>> fStatements;
+ const std::vector<std::unique_ptr<Statement>> fStatements;
typedef Statement INHERITED;
};