Return newly-created value from SpirvRoutine::createIntermediate

src/Pipeline/SpirvShader.cpp

@@ -790,7 +790,6 @@ namespace sw
 				auto &objectTy = getType(object.type);
 				auto &pointer = getObject(pointerId);
 				auto &pointerTy = getType(pointer.type);
-				routine->createIntermediate(objectId, objectTy.sizeInComponents);
 				auto &pointerBase = getObject(pointer.pointerBase);
 				auto &pointerBaseTy = getType(pointerBase.type);
 
@@ -805,7 +804,7 @@ namespace sw
 				}
 
 				auto &ptrBase = routine->getValue(pointer.pointerBase);
-				auto &dst = routine->getIntermediate(objectId);
+				auto &dst = routine->createIntermediate(objectId, objectTy.sizeInComponents);
 
 				if (pointer.kind == Object::Kind::Value)
 				{
@@ -840,7 +839,6 @@ namespace sw
 				auto &object = getObject(objectId);
 				auto &type = getType(typeId);
 				auto &base = getObject(baseId);
-				routine->createIntermediate(objectId, type.sizeInComponents);
 				auto &pointerBase = getObject(object.pointerBase);
 				auto &pointerBaseTy = getType(pointerBase.type);
 				assert(type.sizeInComponents == 1);
@@ -852,7 +850,7 @@ namespace sw
 				{
 					UNIMPLEMENTED("Descriptor-backed OpAccessChain not yet implemented");
 				}
-				auto &dst = routine->getIntermediate(objectId);
+				auto &dst = routine->createIntermediate(objectId, type.sizeInComponents);
 				dst.emplace(0, As<Float4>(WalkAccessChain(baseId, insn.wordCount() - 4, insn.wordPointer(4), routine)));
 				break;
 			}

src/Pipeline/SpirvShader.hpp

@@ -367,11 +367,12 @@ namespace sw
 			lvalues.emplace(id, Value(size));
 		}
 
-		void createIntermediate(SpirvShader::ObjectID id, uint32_t size)
+		Intermediate& createIntermediate(SpirvShader::ObjectID id, uint32_t size)
 		{
-			intermediates.emplace(std::piecewise_construct,
+			auto it = intermediates.emplace(std::piecewise_construct,
 					std::forward_as_tuple(id),
 					std::forward_as_tuple(size));
+			return it.first->second;
 		}
 
 		Value& getValue(SpirvShader::ObjectID id)