From fcdb4629c4c3dd2931eaa88b96b668d914c4519c Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Wed, 10 Aug 2022 11:37:26 -0400
Subject: Yet more refactoring around Artifact (#2352)

* #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.

* Split out CastableList and related types, and placed in core.

* Small fixes around IArtifact.
Improve IArtifact docs.
First impl of getChildren for IArtifact.

* Documentation improvements for Artifact related types.

* Fix typo.

* Special case adding a ICastableList to a LazyCastableList.

* Small simplification of LazyCastableList, by adding State member.

* Removed the ILockFile interface because IFileArtifactRepresentation can be used.
---
 .../slang-artifact-representation-impl.cpp         | 60 ++--------------------
 1 file changed, 5 insertions(+), 55 deletions(-)

(limited to 'source/compiler-core/slang-artifact-representation-impl.cpp')

diff --git a/source/compiler-core/slang-artifact-representation-impl.cpp b/source/compiler-core/slang-artifact-representation-impl.cpp
index 20480ae07..d1de75c79 100644
--- a/source/compiler-core/slang-artifact-representation-impl.cpp
+++ b/source/compiler-core/slang-artifact-representation-impl.cpp
@@ -77,71 +77,21 @@ bool FileArtifactRepresentation::exists()
     return SLANG_SUCCEEDED(res) && pathType == SLANG_PATH_TYPE_FILE;
 }
 
-FileArtifactRepresentation::~FileArtifactRepresentation()
-{
-    if (m_kind == Kind::Owned)
-    {
-        auto fileSystem = _getFileSystem();
-        fileSystem->remove(m_path.getBuffer());
-    }
-}
-
-/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!! LockFile !!!!!!!!!!!!!!!!!!!!!!!!!!! */
-
-void* LockFile::getInterface(const Guid& guid)
+void FileArtifactRepresentation::disown()
 {
-    if (guid == ISlangUnknown::getTypeGuid() ||
-        guid == ICastable::getTypeGuid() ||
-        guid == ILockFile::getTypeGuid())
+    if (_isOwned())
     {
-        return static_cast<ILockFile*>(this);
+        m_kind = Kind::Reference;
     }
-    return nullptr;
-}
-
-void* LockFile::getObject(const Guid& guid)
-{
-    SLANG_UNUSED(guid);
-    return nullptr;
 }
 
-ISlangMutableFileSystem* LockFile::_getFileSystem()
-{
-    return m_fileSystem ? m_fileSystem : OSFileSystem::getMutableSingleton();
-}
-
-void* LockFile::castAs(const Guid& guid)
-{
-    if (auto intf = getInterface(guid))
-    {
-        return intf;
-    }
-    return getObject(guid);
-}
-
-const char* LockFile::getPath()
-{
-    return (m_path.getLength() > 0) ? m_path.getBuffer() : nullptr;
-}
-
-ISlangMutableFileSystem* LockFile::getFileSystem()
-{
-    return m_fileSystem;
-}
-
-LockFile::~LockFile()
+FileArtifactRepresentation::~FileArtifactRepresentation()
 {
-    if (m_path.getLength() > 0)
+    if (_isOwned())
     {
         auto fileSystem = _getFileSystem();
         fileSystem->remove(m_path.getBuffer());
     }
 }
 
-void LockFile::disown()
-{
-    m_path = String();
-    m_fileSystem.setNull();
-}
-
 } // namespace Slang
-- 
cgit v1.2.3