diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2022-08-10 10:04:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-10 10:04:06 -0400 |
| commit | 1378fffd9da094beb41b2db89b96f556c23ab6cb (patch) | |
| tree | e0558c031bd4b1a013dc56b75c4caa3ff5442021 /source/slang/slang-repro.cpp | |
| parent | 89083c4b50af8e48e70b25b63cc62aca21ab706c (diff) | |
Artifact and ICastable (#2351)
* #include an absolute path didn't work - because paths were taken to always be relative.
* WIP with hierarchical enums.
* Some small fixes and improvements around artifact desc related types.
* Improvements around hierarchical enum.
* Fixes to get Artifact types refactor to be able to execute tests.
* Attempt to better categorize PTX.
* Work around for potentially unused function warning.
* Typo fix.
* Simplify Artifact header.
* Small improvements around Artifact kind/payload/style.
* Added IDestroyable/ICastable
* Add IArtifactList.
* First impl of IArtifactUtil.
* Use the ICastable interface for IArtifactRepresentation.
* Added IArtifactRepresentation & IArtifactAssociated.
* Add SLANG_OVERRIDE to avoid gcc/clang warning.
* Fix calling convention issue on win32.
* Fix missing SLANG_OVERRIDE.
* First attempt at file abstraction around Artifact.
* Added creation of lock file.
* Move functionality for determining file paths to the IArtifactUtil.
Add casting to ICastable.
* Added some casting/finding mechanisms.
* Simplify IArtifact interface, and use Items for file reps.
* Fix problem with libraries on DXIL.
* Split out ArtifactRepresentation.
* Move ArtifactDesc functionality to ArtifactDescUtil. ArtifactInfoUtil becomes ArtifactDescUtil.
* Split implementations from the interfaces for Artifact.
* Use TypeTextUtil for target name outputting.
* Add artifact impls.
* Add ICastableList
* Added UnknownCastableAdapter
* Make ISlangSharedLibrary derive from ICastable, and remain backwards compatible with slang-llvm.
* Refactor Representation on Artifact.
* Make our ISlangBlobs also derive from ICastable.
Make ISlangBlob atomic ref counted.
* Fix typo.
Diffstat (limited to 'source/slang/slang-repro.cpp')
| -rw-r--r-- | source/slang/slang-repro.cpp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/source/slang/slang-repro.cpp b/source/slang/slang-repro.cpp index ad275ee7b..ad1bc25fc 100644 --- a/source/slang/slang-repro.cpp +++ b/source/slang/slang-repro.cpp @@ -249,15 +249,15 @@ struct StoreContext base[fileState]->contents = offsetContents; } - if (srcPathInfo->m_canonicalPath && base[fileState]->canonicalPath.isNull()) + if (srcPathInfo->m_canonicalPath.getLength() && base[fileState]->canonicalPath.isNull()) { - auto offsetCanonicalPath = fromString(srcPathInfo->m_canonicalPath->getString()); + auto offsetCanonicalPath = fromString(srcPathInfo->m_canonicalPath); base[fileState]->canonicalPath = offsetCanonicalPath; } - if (srcPathInfo->m_uniqueIdentity && base[fileState]->uniqueIdentity.isNull()) + if (srcPathInfo->m_uniqueIdentity.getLength() && base[fileState]->uniqueIdentity.isNull()) { - auto offsetUniqueIdentity = fromString(srcPathInfo->m_uniqueIdentity->getString()); + auto offsetUniqueIdentity = fromString(srcPathInfo->m_uniqueIdentity); base[fileState]->uniqueIdentity = offsetUniqueIdentity; } } @@ -668,20 +668,19 @@ struct LoadContext // If wasn't loaded, and has contents, use that if (!blob && file->contents) { - blob = new StringBlob(m_base->asRaw(file->contents)->getSlice()); + blob = StringBlob::create(m_base->asRaw(file->contents)->getSlice()); } dstInfo = new CacheFileSystem::PathInfo(String()); if (file->uniqueIdentity) { - String uniqueIdentity = m_base->asRaw(file->uniqueIdentity)->getSlice(); - dstInfo->m_uniqueIdentity = new StringBlob(uniqueIdentity); + dstInfo->m_uniqueIdentity = m_base->asRaw(file->uniqueIdentity)->getSlice(); } if (file->canonicalPath) { - dstInfo->m_canonicalPath = new StringBlob(m_base->asRaw(file->canonicalPath)->getSlice()); + dstInfo->m_canonicalPath = m_base->asRaw(file->canonicalPath)->getSlice(); } if (blob) @@ -865,13 +864,13 @@ struct LoadContext for (const auto& pair : context.m_fileToPathInfoMap) { CacheFileSystem::PathInfo* pathInfo = pair.Value; - SLANG_ASSERT(pathInfo->m_uniqueIdentity); - dstUniqueMap.Add(pathInfo->m_uniqueIdentity->getString(), pathInfo); + SLANG_ASSERT(pathInfo->m_uniqueIdentity.getLength()); + dstUniqueMap.Add(pathInfo->m_uniqueIdentity, pathInfo); // Add canonical paths too.. - if (pathInfo->m_canonicalPath) + if (pathInfo->m_canonicalPath.getLength()) { - String canonicalPath = pathInfo->m_canonicalPath->getString(); + String canonicalPath = pathInfo->m_canonicalPath; dstPathMap.AddIfNotExists(canonicalPath, pathInfo); } @@ -1050,8 +1049,8 @@ struct LoadContext for (const auto& pair : context.m_fileToPathInfoMap) { CacheFileSystem::PathInfo* pathInfo = pair.Value; - SLANG_ASSERT(pathInfo->m_uniqueIdentity); - dstUniqueMap.Add(pathInfo->m_uniqueIdentity->getString(), pathInfo); + SLANG_ASSERT(pathInfo->m_uniqueIdentity.getLength()); + dstUniqueMap.Add(pathInfo->m_uniqueIdentity, pathInfo); } } |
