Merge branch 'opsource-order' into 'master'

SPIRV/SpvBuilder.cpp

@@ -2162,21 +2162,12 @@ void Builder::dump(std::vector<unsigned int>& out) const
     out.push_back(uniqueId + 1);
     out.push_back(0);
 
-    // First instructions, some created on the spot here:
-    if (source != SourceLanguageUnknown) {
-        Instruction sourceInst(0, 0, OpSource);
-        sourceInst.addImmediateOperand(source);
-        sourceInst.addImmediateOperand(sourceVersion);
-        sourceInst.dump(out);
-    }
     for (int e = 0; e < (int)extensions.size(); ++e) {
         Instruction extInst(0, 0, OpSourceExtension);
         extInst.addStringOperand(extensions[e]);
         extInst.dump(out);
     }
 
-    // TBD: OpExtension ...
-
     // Capabilities
     for (auto cap : capabilities) {
         Instruction capInst(0, 0, OpCapability);
@@ -2184,6 +2175,8 @@ void Builder::dump(std::vector<unsigned int>& out) const
         capInst.dump(out);
     }
 
+    // TBD: OpExtension ...
+
     dumpInstructions(out, imports);
     Instruction memInst(0, 0, OpMemoryModel);
     memInst.addImmediateOperand(addressModel);
@@ -2193,9 +2186,20 @@ void Builder::dump(std::vector<unsigned int>& out) const
     // Instructions saved up while building:
     dumpInstructions(out, entryPoints);
     dumpInstructions(out, executionModes);
+
+    // Debug instructions
+    if (source != SourceLanguageUnknown) {
+        Instruction sourceInst(0, 0, OpSource);
+        sourceInst.addImmediateOperand(source);
+        sourceInst.addImmediateOperand(sourceVersion);
+        sourceInst.dump(out);
+    }
     dumpInstructions(out, names);
     dumpInstructions(out, lines);
+
+    // Annotation instructions
     dumpInstructions(out, decorations);
+
     dumpInstructions(out, constantsTypesGlobals);
     dumpInstructions(out, externals);