diff --git a/Test/baseLegalResults/hlsl.partialFlattenLocal.vert.out b/Test/baseLegalResults/hlsl.partialFlattenLocal.vert.out
index 8bf9614dcb8def3fb59acdb5ac3831cefbf06e00..c479436244f7438dd8f0182ca52f9ca8238514ea 100755
--- a/Test/baseLegalResults/hlsl.partialFlattenLocal.vert.out
+++ b/Test/baseLegalResults/hlsl.partialFlattenLocal.vert.out
@@ -1,7 +1,7 @@
 hlsl.partialFlattenLocal.vert
 // Module Version 10000
 // Generated by (magic number): 80006
-// Id's are bound by 169
+// Id's are bound by 158
 
                               Capability Shader
                1:             ExtInstImport  "GLSL.std.450"
@@ -51,29 +51,29 @@ hlsl.partialFlattenLocal.vert
                               Store 137 38
                               Branch 100
              100:             Label
-             168:     21(int) Phi 25 5 119 106
-             105:    54(bool) SLessThan 168 31
+             157:     21(int) Phi 25 5 119 106
+             105:    54(bool) SLessThan 157 31
                               LoopMerge 101 106 None
                               BranchConditional 105 106 101
              106:               Label
-             138:     39(ptr)   AccessChain 133 168
+             138:     39(ptr)   AccessChain 133 157
              110:   18(fvec2)   Load 138
-             139:     34(ptr)   AccessChain 131 168
+             139:     34(ptr)   AccessChain 131 157
              112:   14(fvec3)   Load 139
              113:   18(fvec2)   VectorShuffle 112 112 0 1
              114:   18(fvec2)   FAdd 113 110
-             140:     34(ptr)   AccessChain 131 168
+             140:     34(ptr)   AccessChain 131 157
              116:   14(fvec3)   Load 140
              117:   14(fvec3)   VectorShuffle 116 114 3 4 2
                                 Store 140 117
-             119:     21(int)   IAdd 168 31
+             119:     21(int)   IAdd 157 31
                                 Branch 100
              101:             Label
              142:          17 Load 131
-             161:   14(fvec3) CompositeExtract 142 0
-             124:    6(float) CompositeExtract 161 0
-             125:    6(float) CompositeExtract 161 1
-             126:    6(float) CompositeExtract 161 2
+             156:   14(fvec3) CompositeExtract 142 0
+             124:    6(float) CompositeExtract 156 0
+             125:    6(float) CompositeExtract 156 1
+             126:    6(float) CompositeExtract 156 2
              127:    7(fvec4) CompositeConstruct 124 125 126 32
              128:    7(fvec4) FAdd 84 127
                               Store 86(@entryPointOutput) 128
diff --git a/known_good.json b/known_good.json
index 94b33f3dad20da5705195eaf6e866d731628308e..3b202f6c3d63b7f2f64017f827ac7f9f97cdc34e 100644
--- a/known_good.json
+++ b/known_good.json
@@ -5,7 +5,7 @@
       "site" : "github",
       "subrepo" : "KhronosGroup/SPIRV-Tools",
       "subdir" : "External/spirv-tools",
-      "commit" : "a00a0a09ae5dab8ef15073ceb40542c162767798"
+      "commit" : "a579e720a8d7805ec9ebf657a4c6fa67ec268f7e"
     },
     {
       "name" : "spirv-tools/external/spirv-headers",