More #line improvements (#1713)

* #include an absolute path didn't work - because paths were taken to always be relative.

* WIP: First pass in supporting output of line error information.

* Add support for lexing to better be able to indicate SourceLocation information.

* Fix lexer usage in DiagnosticSink in C++ extractor.

* Update diagnostics tests to have line location info.

* Fixed test expected output that now have source location information in them.

* Better handling of tab.

* Fix test expected results for tabbing change.

* DiagnosticLexer -> DiagnosticSink::SourceLocationLexer
Added line continuation tests.

* Fix typo.

* Added String::appendRepeatedChar

* Change to rerun tests.

* Added source locations to IR dumping.

* Output column for IR dump source loc.

* Add support for closing brace location to AST.
Use closing brace location in lowering when adding return void.

* Set the source location through SourceLoc - simplifies identifying if current loc is valid.

* Copy terminator sloc.

* Test for improved #line handling.

* Made writer the last parameter for dumpIR.
Small improvements to comments.

* Disable sloc output on dump IR by default.

* Fix issue with #line and inlining.

* Fix for output with improved #line output.

* Small comment change - mainly to kick off TC build.

Co-authored-by: Tim Foley <tfoleyNV@users.noreply.github.com>

1 files changed, 15 insertions, 2 deletions

diff --git a/source/slang/slang-lower-to-ir.cpp b/source/slang/slang-lower-to-ir.cpp
index 9b1c4b1a6..ef4cb98ec 100644
--- a/source/slang/slang-lower-to-ir.cpp
+++ b/source/slang/slang-lower-to-ir.cpp
@@ -7043,7 +7043,16 @@ struct DeclLoweringVisitor : DeclVisitor<DeclLoweringVisitor, LoweredValInfo>
                 {
                     // `void`-returning function can get an implicit
                     // return on exit of the body statement.
-                    subContext->irBuilder->emitReturn();
+                    IRInst* returnInst = subContext->irBuilder->emitReturn();
+
+                    if (BlockStmt* blockStmt = as<BlockStmt>(decl->body))
+                    {
+                        returnInst->sourceLoc = blockStmt->closingSourceLoc;
+                    }
+                    else
+                    {
+                        returnInst->sourceLoc = SourceLoc();
+                    }
                 }
                 else
                 {
@@ -7938,7 +7947,11 @@ IRModule* generateIRForTranslationUnit(
     if(compileRequest->shouldDumpIR)
     {
         DiagnosticSinkWriter writer(compileRequest->getSink());
-        dumpIR(module, &writer, "LOWER-TO-IR");
+
+        IRDumpOptions options;
+        options.sourceManager = compileRequest->getSourceManager();
+
+        dumpIR(module, options, "LOWER-TO-IR", &writer);
     }
 
     return module;