commit cf3059e719c3dbab358ed1a535c280be8c706c35
author John Stiles <johnstiles@google.com> Thu Feb 25 14:27:02 2021 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Feb 25 19:28:59 2021 +0000
tree 2fa65af76a175f64f16c1041e45540229f868f16
parent 511c500ad4d4a13fe0aa39e21ac8557689662b30

Convert IRGenerator::convertIf to IfStatement::Make.

This lets the Rehydrator and Inliner benefit from static optimization
opportunities, like converting `if (false) {...}` to a Nop.

Change-Id: I70b4fceab84c50ea270dc894b0d6fe0e7e2369eb
Bug: skia:11342
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375777
Commit-Queue: John Stiles <johnstiles@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>

src/sksl/SkSLInliner.cpp

diff --git a/src/sksl/SkSLInliner.cpp b/src/sksl/SkSLInliner.cpp
index e8ac206..59e6966 100644
--- a/src/sksl/SkSLInliner.cpp
+++ b/src/sksl/SkSLInliner.cpp
@@ -467,8 +467,8 @@
         }
         case Statement::Kind::kIf: {
             const IfStatement& i = statement.as<IfStatement>();
-            return std::make_unique<IfStatement>(offset, i.isStatic(), expr(i.test()),
-                                                 stmt(i.ifTrue()), stmt(i.ifFalse()));
+            return IfStatement::Make(*fContext, offset, i.isStatic(), expr(i.test()),
+                                     stmt(i.ifTrue()), stmt(i.ifFalse()));
         }
         case Statement::Kind::kInlineMarker:
         case Statement::Kind::kNop: