From be8497804f803c02cfab1aa2c54d921042e90ec9 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Thu, 1 Sep 2022 15:38:17 -0400 Subject: Remove artifact from SourceFile (#2384) * #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. * Remove artifact from SourceFile. Lazily generate SourceFile from artifacts as needed. * Fix some small bugs. * Remove maybeAddArtifact. * Load artifacts if repro capture is enabled. * Remove adding by string, because doing so means source will be allocated twice or there is a potential race around ref counting to the contained String. * Add built in source as a blob. * Fix warning. * Make StringBlob own the contents if moved. Fix some compilation issues. * Share StringBlob uniqueness code. * Do move unique on Ctor. * Change MoveUnique to not have any values. * MoveUnique can more sensibly be a struct. Co-authored-by: Yong He --- source/core/slang-blob.cpp | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'source/core/slang-blob.cpp') diff --git a/source/core/slang-blob.cpp b/source/core/slang-blob.cpp index 6cf5214cc..a4acb98cb 100644 --- a/source/core/slang-blob.cpp +++ b/source/core/slang-blob.cpp @@ -35,6 +35,25 @@ void* BlobBase::castAs(const SlangUUID& guid) /* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! StringBlob !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */ +StringBlob::StringBlob(MoveUnique, String& in) +{ + auto rep = in.getStringRepresentation(); + if (rep && !rep->isUniquelyReferenced()) + { + // Make a new unique copy + m_string = in.getUnownedSlice(); + + // Move out of in + String tmp; + tmp.swapWith(in); + } + else + { + // Must either not have a rep or be unique + m_string.swapWith(in); + } +} + void* StringBlob::castAs(const SlangUUID& guid) { if (auto intf = getInterface(guid)) @@ -59,6 +78,16 @@ void* StringBlob::getObject(const Guid& guid) return nullptr; } +/* static */ComPtr StringBlob::moveCreate(String& in) +{ + return ComPtr(new StringBlob(MoveUnique{}, in)); +} + +/* static */ComPtr StringBlob::moveCreate(String&& in) +{ + return ComPtr(new StringBlob(MoveUnique{}, in)); +} + /* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! RawBlob !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */ void* RawBlob::castAs(const SlangUUID& guid) -- cgit v1.2.3