1 files changed, 8 insertions, 0 deletions
diff --git a/source/slang/emit.cpp b/source/slang/emit.cpp
index 295551639..311f903cc 100644
--- a/source/slang/emit.cpp
+++ b/source/slang/emit.cpp
@@ -578,6 +578,7 @@ struct EmitVisitor
 
         std::ostringstream stream;
         stream.imbue(std::locale::classic());
+        stream.setf(std::ios::fixed,std::ios::floatfield);
         stream.precision(20);
         stream << value;
 
@@ -5322,6 +5323,9 @@ emitDeclImpl(decl, nullptr);
         IRValue*        value)
     {
         IRInst* inst = (IRInst*) value;
+
+        advanceToSourceLocation(inst->sourceLoc);
+
         switch(value->op)
         {
         case kIROp_IntLit:
@@ -5617,6 +5621,8 @@ emitDeclImpl(decl, nullptr);
             return;
         }
 
+        advanceToSourceLocation(inst->sourceLoc);
+
         switch(inst->op)
         {
         default:
@@ -5780,6 +5786,8 @@ emitDeclImpl(decl, nullptr);
 
             // Now look at the terminator instruction, which will tell us what we need to emit next.
 
+            advanceToSourceLocation(terminator->sourceLoc);
+
             switch (terminator->op)
             {
             default: