From 3c0177134d126956336865623ea3d6861be59cfa Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Thu, 1 Sep 2022 10:06:19 -0400 Subject: Make FileSystem files and OS files distinct (#2383) * #include an absolute path didn't work - because paths were taken to always be relative. * Make DownstreamCompileOptions use POD types. * CharSliceAllocator -> SliceAllocator Added SliceConverter CharSliceCaster -> SliceCaster * First attempt at zero terminating around blobs. * Fix clang warning. * Add SlangTerminatedChars Make Blob implementations support it. Make most blobs 'terminated'. * Fix bug setting up sourceFiles for CommandLineDownstreamCompiler. * Traffic in TerminatedCharSlice for sourceFiles. Use ArtifactDesc to generate temporary file names for source. * Fix typo in testing for shared library/C++. * Working with source being passed as artifacts to DownstreamCompiler. * Use artifacts in SourceManager/SourceFile. * Support infering extension from the original file extension. * * Infer extension if can't determine from the artifact type * Split IOSFile/IExtFile representations * Move responsibility for creating OS file to the handler. * Disable the check memory path. --- source/compiler-core/slang-include-system.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/compiler-core/slang-include-system.cpp') diff --git a/source/compiler-core/slang-include-system.cpp b/source/compiler-core/slang-include-system.cpp index 455ecde2b..9cd193ec6 100644 --- a/source/compiler-core/slang-include-system.cpp +++ b/source/compiler-core/slang-include-system.cpp @@ -132,7 +132,7 @@ SlangResult IncludeSystem::loadFile(const PathInfo& pathInfo, ComPtr sourceFile = m_sourceManager->createSourceFileWithBlob(pathInfo, foundSourceBlob); m_sourceManager->addSourceFile(pathInfo.uniqueIdentity, sourceFile); - sourceFile->maybeAddArtifact(m_fileSystemExt); + sourceFile->maybeAddArtifact(nullptr, m_fileSystemExt); outBlob = foundSourceBlob; return SLANG_OK; @@ -152,7 +152,7 @@ SlangResult IncludeSystem::loadFile(const PathInfo& pathInfo, ComPtr } sourceFile->setContents(foundSourceBlob); - sourceFile->maybeAddArtifact(m_fileSystemExt); + sourceFile->maybeAddArtifact(nullptr, m_fileSystemExt); outBlob = foundSourceBlob; return SLANG_OK; -- cgit v1.2.3