Merge pull request #1166 from tafuri/#1165-invalid_Store

#1165 invalid store
2017-11-28 19:41:52 -07:00
parent b2abe2f0a5 66b319d30b
commit 1ce94b2d68
5 changed files with 1099 additions and 890 deletions
--- a/hlsl/hlslParseHelper.cpp
+++ b/hlsl/hlslParseHelper.cpp
@@ -3274,6 +3274,9 @@ void HlslParseContext::decomposeStructBufferMethods(const TSourceLoc& loc, TInte
                                                                                        : EOpIndexIndirect;

                TIntermTyped* lValue = intermediate.addIndex(idxOp, argArray, offsetIdx, loc);
+                const TType derefType(argArray->getType(), 0);
+                lValue->setType(derefType);
+
                TIntermTyped* rValue = (size == 1) ? argValue :
                    intermediate.addIndex(EOpIndexDirect, argValue, idxConst, loc);