From 1378fffd9da094beb41b2db89b96f556c23ab6cb Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Wed, 10 Aug 2022 10:04:06 -0400
Subject: 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.
---
 source/core/slang-file-system.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'source/core/slang-file-system.cpp')

diff --git a/source/core/slang-file-system.cpp b/source/core/slang-file-system.cpp
index 52ec40c07..6d9ad4324 100644
--- a/source/core/slang-file-system.cpp
+++ b/source/core/slang-file-system.cpp
@@ -608,13 +608,14 @@ SlangResult CacheFileSystem::loadFile(char const* pathIn, ISlangBlob** blobOut)
 
 SlangResult CacheFileSystem::getFileUniqueIdentity(const char* path, ISlangBlob** outUniqueIdentity)
 {
+    *outUniqueIdentity = nullptr;
     PathInfo* info = _resolvePathCacheInfo(path);
-    if (!info)
+    if (!info || info->m_uniqueIdentity.getLength() <= 0)
     {
         return SLANG_E_NOT_FOUND;
     }
-    info->m_uniqueIdentity->addRef();
-    *outUniqueIdentity = info->m_uniqueIdentity;
+
+    *outUniqueIdentity = StringBlob::create(info->m_uniqueIdentity).detach();
     return SLANG_OK;
 }
 
@@ -694,6 +695,8 @@ SlangResult CacheFileSystem::getSimplifiedPath(const char* path, ISlangBlob** ou
 
 SlangResult CacheFileSystem::getCanonicalPath(const char* path, ISlangBlob** outCanonicalPath)
 {
+    *outCanonicalPath = nullptr;
+
     // A file must exist to get a canonical path... 
     PathInfo* info = _resolvePathCacheInfo(path);
     if (!info)
@@ -716,12 +719,8 @@ SlangResult CacheFileSystem::getCanonicalPath(const char* path, ISlangBlob** out
         if (SLANG_SUCCEEDED(res))
         {
             // Get the path as a string
-            String canonicalPath = StringUtil::getString(canonicalPathBlob);
-            if (canonicalPath.getLength() > 0)
-            {
-                info->m_canonicalPath = new StringBlob(canonicalPath);
-            }
-            else
+            info->m_canonicalPath = StringUtil::getString(canonicalPathBlob);
+            if (info->m_canonicalPath.getLength() <= 0)
             {
                 res = SLANG_FAIL;
             }
@@ -731,11 +730,12 @@ SlangResult CacheFileSystem::getCanonicalPath(const char* path, ISlangBlob** out
         info->m_getCanonicalPathResult = toCompressedResult(res);
     }
 
-    if (info->m_canonicalPath)
+    // Create the blob
+    if (info->m_canonicalPath.getLength())
     {
-        info->m_canonicalPath->addRef();
+        *outCanonicalPath = StringBlob::create(info->m_canonicalPath).detach();
     }
-    *outCanonicalPath = info->m_canonicalPath;
+
     return SLANG_OK;
 }
 
-- 
cgit v1.2.3