commit 3908059bee7f35b669910b379bc90c258bc3b7bc
author Ethan Nicholas <ethannicholas@google.com> Mon Jul 22 14:54:43 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jul 22 19:37:40 2019 +0000
tree 93cd4d3506852bf69dd4da1cc190347105539838
parent 5e533c9e1f2798dd5efa020160d5c84fa764791f

fixed SkSL handling of constant arrays

Bug: skia:
Change-Id: Ib01a9a01a0e9e5c27ea5142f8141b769ef093669
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/229012
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

src/sksl/ir/SkSLVariableReference.cpp

diff --git a/src/sksl/ir/SkSLVariableReference.cpp b/src/sksl/ir/SkSLVariableReference.cpp
index c7b17a9..2de8410 100644
--- a/src/sksl/ir/SkSLVariableReference.cpp
+++ b/src/sksl/ir/SkSLVariableReference.cpp
@@ -100,7 +100,7 @@
         return irGenerator.getArg(fOffset, fVariable.fName);
     }
     if ((fVariable.fModifiers.fFlags & Modifiers::kConst_Flag) && fVariable.fInitialValue &&
-        fVariable.fInitialValue->isConstant()) {
+        fVariable.fInitialValue->isConstant() && fType.kind() != Type::kArray_Kind) {
         return copy_constant(irGenerator, fVariable.fInitialValue);
     }
     auto exprIter = definitions.find(&fVariable);