Associating GUID (or UUID) with types (#1776)

* #include an absolute path didn't work - because paths were taken to always be relative.

* Add mechanism to embed guid inside of type.

15 files changed, 35 insertions, 97 deletions

diff --git a/source/core/slang-blob.cpp b/source/core/slang-blob.cpp
index becccf51c..569991508 100644
--- a/source/core/slang-blob.cpp
+++ b/source/core/slang-blob.cpp
@@ -2,18 +2,14 @@
 
 namespace Slang {
 
-// Allocate static const storage for the various interface IDs that the Slang API needs to expose
-static const Guid IID_ISlangUnknown = SLANG_UUID_ISlangUnknown;
-static const Guid IID_ISlangBlob = SLANG_UUID_ISlangBlob;
-
 ISlangUnknown* BlobBase::getInterface(const Guid& guid)
 {
-    return (guid == IID_ISlangUnknown || guid == IID_ISlangBlob) ? static_cast<ISlangBlob*>(this) : nullptr;
+    return (guid == ISlangUnknown::getTypeGuid() || guid == ISlangBlob::getTypeGuid()) ? static_cast<ISlangBlob*>(this) : nullptr;
 }
 
 SlangResult StaticBlob::queryInterface(SlangUUID const& guid, void** outObject) 
 {
-    if (guid == IID_ISlangUnknown || guid == IID_ISlangBlob)
+    if (guid == ISlangUnknown::getTypeGuid() || guid == ISlangBlob::getTypeGuid())
     {
         *outObject = static_cast<ISlangBlob*>(this);
         return SLANG_OK;
diff --git a/source/core/slang-compression-system.h b/source/core/slang-compression-system.h
index f9fe9dfe1..ecc5b1be9 100644
--- a/source/core/slang-compression-system.h
+++ b/source/core/slang-compression-system.h
@@ -29,7 +29,7 @@ enum class CompressionSystemType
 
 class ICompressionSystem : public ISlangUnknown
 {
-public:
+    SLANG_COM_INTERFACE(0xcc935840, 0xe059, 0x4bb8, { 0xa2, 0x2d, 0x92, 0x7b, 0x3c, 0x73, 0x8f, 0x85 })
 
         /** Get the compression system type
         @return The compression system type */
@@ -51,8 +51,6 @@ public:
     virtual SLANG_NO_THROW SlangResult SLANG_MCALL decompress(const void* compressed, size_t compressedSizeInBytes, size_t decompressedSizeInBytes, void* outDecompressed) = 0;
 };
 
-#define SLANG_UUID_ICompressionSystem { 0xcc935840, 0xe059, 0x4bb8, { 0xa2, 0x2d, 0x92, 0x7b, 0x3c, 0x73, 0x8f, 0x85 } };
-
 }
 
 #endif
diff --git a/source/core/slang-deflate-compression-system.cpp b/source/core/slang-deflate-compression-system.cpp
index a316be122..dab6654f7 100644
--- a/source/core/slang-deflate-compression-system.cpp
+++ b/source/core/slang-deflate-compression-system.cpp
@@ -17,8 +17,6 @@ namespace Slang
 {
 
 // Allocate static const storage for the various interface IDs that the Slang API needs to expose
-static const Guid IID_ISlangUnknown = SLANG_UUID_ISlangUnknown;
-static const Guid IID_ICompressionSystem = SLANG_UUID_ICompressionSystem;
 
 class DeflateCompressionSystemImpl : public RefObject, public ICompressionSystem
 {
@@ -42,7 +40,7 @@ protected:
 
 ICompressionSystem* DeflateCompressionSystemImpl::getInterface(const Guid& guid)
 {
-    return (guid == IID_ISlangUnknown || guid == IID_ICompressionSystem) ? static_cast<ICompressionSystem*>(this) : nullptr;
+    return (guid == ISlangUnknown::getTypeGuid() || guid == ICompressionSystem::getTypeGuid()) ? static_cast<ICompressionSystem*>(this) : nullptr;
 }
 
 SlangResult DeflateCompressionSystemImpl::compress(const CompressionStyle* style, const void* src, size_t srcSizeInBytes, ISlangBlob** outBlob)
diff --git a/source/core/slang-file-system.cpp b/source/core/slang-file-system.cpp
index 992ae4155..91dd09ff9 100644
--- a/source/core/slang-file-system.cpp
+++ b/source/core/slang-file-system.cpp
@@ -8,27 +8,21 @@ namespace Slang
 {
 
 // Allocate static const storage for the various interface IDs that the Slang API needs to expose
-static const Guid IID_ISlangUnknown = SLANG_UUID_ISlangUnknown;
-static const Guid IID_ISlangFileSystem = SLANG_UUID_ISlangFileSystem;
-static const Guid IID_ISlangFileSystemExt = SLANG_UUID_ISlangFileSystemExt;
-static const Guid IID_ISlangMutableFileSystem = SLANG_UUID_ISlangMutableFileSystem;
-
-static const Guid IID_SlangCacheFileSystem = SLANG_UUID_CacheFileSystem;
 
 SLANG_FORCE_INLINE static SlangResult _checkExt(FileSystemStyle style) { return Index(style) >= Index(FileSystemStyle::Ext) ? SLANG_OK : SLANG_E_NOT_IMPLEMENTED; }
 SLANG_FORCE_INLINE static SlangResult _checkMutable(FileSystemStyle style) { return Index(style) >= Index(FileSystemStyle::Mutable) ? SLANG_OK : SLANG_E_NOT_IMPLEMENTED; }
 
 SLANG_FORCE_INLINE static bool _canCast(FileSystemStyle style, const Guid& guid)
 {
-    if (guid == IID_ISlangUnknown || guid == IID_ISlangFileSystem)
+    if (guid == ISlangUnknown::getTypeGuid() || guid == ISlangFileSystem::getTypeGuid())
     {
         return true;
     }
-    else if (guid == IID_ISlangFileSystemExt)
+    else if (guid == ISlangFileSystemExt::getTypeGuid())
     {
         return Index(style) >= Index(FileSystemStyle::Ext);
     }
-    else if (guid == IID_ISlangMutableFileSystem)
+    else if (guid == ISlangMutableFileSystem::getTypeGuid())
     {
         return Index(style) >= Index(FileSystemStyle::Mutable);
     }
@@ -41,11 +35,11 @@ static FileSystemStyle _getFileSystemStyle(ISlangFileSystem* system, ComPtr<ISla
 
     FileSystemStyle style = FileSystemStyle::Load;
 
-    if (SLANG_SUCCEEDED(system->queryInterface(IID_ISlangMutableFileSystem, (void**)out.writeRef())))
+    if (SLANG_SUCCEEDED(system->queryInterface(ISlangMutableFileSystem::getTypeGuid(), (void**)out.writeRef())))
     {
         style = FileSystemStyle::Mutable; 
     }
-    else if (SLANG_SUCCEEDED(system->queryInterface(IID_ISlangFileSystemExt, (void**)out.writeRef())))
+    else if (SLANG_SUCCEEDED(system->queryInterface(ISlangFileSystemExt::getTypeGuid(), (void**)out.writeRef())))
     {
         style = FileSystemStyle::Ext;
     }
@@ -269,7 +263,7 @@ SlangResult OSFileSystem::createDirectory(const char* path)
 
 SLANG_NO_THROW SlangResult SLANG_MCALL CacheFileSystem::queryInterface(SlangUUID const& uuid, void** outObject)
 {
-    if (uuid == IID_SlangCacheFileSystem)
+    if (uuid == CacheFileSystem::getTypeGuid())
     {
         *outObject = this;
         return SLANG_OK;
@@ -310,7 +304,7 @@ void CacheFileSystem::setInnerFileSystem(ISlangFileSystem* fileSystem, UniqueIde
     if (fileSystem)
     {
         // Try to get the more sophisticated interface
-        fileSystem->queryInterface(IID_ISlangFileSystemExt, (void**)m_fileSystemExt.writeRef());
+        fileSystem->queryInterface(ISlangFileSystemExt::getTypeGuid(), (void**)m_fileSystemExt.writeRef());
     }
 
     switch (m_uniqueIdentityMode)
diff --git a/source/core/slang-file-system.h b/source/core/slang-file-system.h
index d5145404d..caf7ffc23 100644
--- a/source/core/slang-file-system.h
+++ b/source/core/slang-file-system.h
@@ -70,8 +70,6 @@ private:
     static OSFileSystem g_mutable;
 };
 
- #define SLANG_UUID_CacheFileSystem { 0x2f4d1d03, 0xa0d1, 0x434b, { 0x87, 0x7a, 0x65, 0x5, 0xa4, 0xa0, 0x9a, 0x3b } };
-
 /* Wraps an underlying ISlangFileSystem or ISlangFileSystemExt and provides caching, 
 as well as emulation of methods if only has ISlangFileSystem interface. Will query capabilities
 of the interface on the constructor.
@@ -83,6 +81,7 @@ NOTE! That this behavior is the same as previously in that....
 class CacheFileSystem: public ISlangFileSystemExt, public RefObject
 {
     public:
+    SLANG_CLASS_GUID(0x2f4d1d03, 0xa0d1, 0x434b, { 0x87, 0x7a, 0x65, 0x5, 0xa4, 0xa0, 0x9a, 0x3b })
 
     enum class PathStyle
     {
diff --git a/source/core/slang-lz4-compression-system.cpp b/source/core/slang-lz4-compression-system.cpp
index fa5c5f5ab..fd360ce2e 100644
--- a/source/core/slang-lz4-compression-system.cpp
+++ b/source/core/slang-lz4-compression-system.cpp
@@ -11,8 +11,6 @@ namespace Slang
 {
 
 // Allocate static const storage for the various interface IDs that the Slang API needs to expose
-static const Guid IID_ISlangUnknown = SLANG_UUID_ISlangUnknown;
-static const Guid IID_ICompressionSystem = SLANG_UUID_ICompressionSystem;
 
 class LZ4CompressionSystemImpl : public RefObject, public ICompressionSystem 
 {
@@ -35,7 +33,7 @@ protected:
 
 ICompressionSystem* LZ4CompressionSystemImpl::getInterface(const Guid& guid)
 {
-    return (guid == IID_ISlangUnknown || guid == IID_ICompressionSystem) ? static_cast<ICompressionSystem*>(this) : nullptr;
+    return (guid == ISlangUnknown::getTypeGuid() || guid == ICompressionSystem::getTypeGuid()) ? static_cast<ICompressionSystem*>(this) : nullptr;
 }
 
 SlangResult LZ4CompressionSystemImpl::compress(const CompressionStyle* style, const void* src, size_t srcSizeInBytes, ISlangBlob** outBlob)
diff --git a/source/core/slang-riff-file-system.cpp b/source/core/slang-riff-file-system.cpp
index 7084e1346..d52015fb3 100644
--- a/source/core/slang-riff-file-system.cpp
+++ b/source/core/slang-riff-file-system.cpp
@@ -16,12 +16,6 @@
 namespace Slang
 {
 
-// Allocate static const storage for the various interface IDs that the Slang API needs to expose
-static const Guid IID_ISlangUnknown = SLANG_UUID_ISlangUnknown;
-static const Guid IID_ISlangFileSystem = SLANG_UUID_ISlangFileSystem;
-static const Guid IID_ISlangFileSystemExt = SLANG_UUID_ISlangFileSystemExt;
-static const Guid IID_ISlangMutableFileSystem = SLANG_UUID_ISlangMutableFileSystem;
-
 RiffFileSystem::RiffFileSystem(ICompressionSystem* compressionSystem):
     m_compressionSystem(compressionSystem)
 {
@@ -29,7 +23,7 @@ RiffFileSystem::RiffFileSystem(ICompressionSystem* compressionSystem):
 
 ISlangMutableFileSystem* RiffFileSystem::getInterface(const Guid& guid)
 {
-    return (guid == IID_ISlangUnknown || guid == IID_ISlangFileSystem || guid == IID_ISlangFileSystemExt || guid == IID_ISlangMutableFileSystem) ? static_cast<ISlangMutableFileSystem*>(this) : nullptr;
+    return (guid == ISlangUnknown::getTypeGuid() || guid == ISlangFileSystem::getTypeGuid() || guid == ISlangFileSystemExt::getTypeGuid() || guid == ISlangMutableFileSystem::getTypeGuid()) ? static_cast<ISlangMutableFileSystem*>(this) : nullptr;
 }
 
 SlangResult RiffFileSystem::_calcCanonicalPath(const char* path, StringBuilder& out)
diff --git a/source/core/slang-shared-library.cpp b/source/core/slang-shared-library.cpp
index 8d362fd89..17b881540 100644
--- a/source/core/slang-shared-library.cpp
+++ b/source/core/slang-shared-library.cpp
@@ -20,18 +20,13 @@
 namespace Slang
 {
 
-// Allocate static const storage for the various interface IDs that the Slang API needs to expose
-static const Guid IID_ISlangUnknown = SLANG_UUID_ISlangUnknown;
-static const Guid IID_ISlangSharedLibrary = SLANG_UUID_ISlangSharedLibrary;
-static const Guid IID_ISlangSharedLibraryLoader = SLANG_UUID_ISlangSharedLibraryLoader;
-
 /* !!!!!!!!!!!!!!!!!!!!!!!!!! DefaultSharedLibraryLoader !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 /* static */DefaultSharedLibraryLoader DefaultSharedLibraryLoader::s_singleton;
 
 ISlangUnknown* DefaultSharedLibraryLoader::getInterface(const Guid& guid)
 {
-    return (guid == IID_ISlangUnknown || guid == IID_ISlangSharedLibraryLoader) ? static_cast<ISlangSharedLibraryLoader*>(this) : nullptr;
+    return (guid == ISlangUnknown::getTypeGuid() || guid == ISlangSharedLibraryLoader::getTypeGuid()) ? static_cast<ISlangSharedLibraryLoader*>(this) : nullptr;
 }
 
 SlangResult DefaultSharedLibraryLoader::loadSharedLibrary(const char* path, ISlangSharedLibrary** outSharedLibrary)
@@ -83,7 +78,7 @@ TemporarySharedLibrary::~TemporarySharedLibrary()
 
 ISlangUnknown* DefaultSharedLibrary::getInterface(const Guid& guid)
 {
-    return (guid == IID_ISlangUnknown || guid == IID_ISlangSharedLibrary) ? static_cast<ISlangSharedLibrary*>(this) : nullptr;
+    return (guid == ISlangUnknown::getTypeGuid() || guid == ISlangSharedLibrary::getTypeGuid()) ? static_cast<ISlangSharedLibrary*>(this) : nullptr;
 }
 
 DefaultSharedLibrary::~DefaultSharedLibrary()
diff --git a/source/core/slang-writer.cpp b/source/core/slang-writer.cpp
index 0f8286553..3b1a5756a 100644
--- a/source/core/slang-writer.cpp
+++ b/source/core/slang-writer.cpp
@@ -18,8 +18,6 @@
 
 namespace Slang
 {
-static const Guid IID_ISlangWriter = SLANG_UUID_ISlangWriter;
-static const Guid IID_ISlangUnknown = SLANG_UUID_ISlangUnknown;
 
 /* !!!!!!!!!!!!!!!!!!!!!!!!! WriterHelper !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
@@ -66,7 +64,7 @@ SlangResult WriterHelper::put(const UnownedStringSlice& text)
 
 ISlangUnknown* BaseWriter::getInterface(const Guid& guid)
 {
-    return (guid == IID_ISlangUnknown || guid == IID_ISlangWriter) ? static_cast<ISlangWriter*>(this) : nullptr;
+    return (guid == ISlangUnknown::getTypeGuid() || guid == ISlangWriter::getTypeGuid()) ? static_cast<ISlangWriter*>(this) : nullptr;
 }
 
 /* !!!!!!!!!!!!!!!!!!!!!!!!! AppendBufferWriter !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
diff --git a/source/core/slang-zip-file-system.cpp b/source/core/slang-zip-file-system.cpp
index a56ba09db..1ed003d55 100644
--- a/source/core/slang-zip-file-system.cpp
+++ b/source/core/slang-zip-file-system.cpp
@@ -19,12 +19,6 @@
 namespace Slang
 {
 
-// Allocate static const storage for the various interface IDs that the Slang API needs to expose
-static const Guid IID_ISlangUnknown = SLANG_UUID_ISlangUnknown;
-static const Guid IID_ISlangFileSystem = SLANG_UUID_ISlangFileSystem;
-static const Guid IID_ISlangFileSystemExt = SLANG_UUID_ISlangFileSystemExt;
-static const Guid IID_ISlangMutableFileSystem = SLANG_UUID_ISlangMutableFileSystem;
-
 class ZipFileSystemImpl : public ArchiveFileSystem 
 {
 public:
@@ -108,7 +102,7 @@ protected:
 
 ISlangMutableFileSystem* ZipFileSystemImpl::getInterface(const Guid& guid)
 {
-    return (guid == IID_ISlangUnknown || guid == IID_ISlangFileSystem || guid == IID_ISlangFileSystemExt || guid == IID_ISlangMutableFileSystem) ? static_cast<ISlangMutableFileSystem*>(this) : nullptr;
+    return (guid == ISlangUnknown::getTypeGuid() || guid == ISlangFileSystem::getTypeGuid() || guid == ISlangFileSystemExt::getTypeGuid() || guid == ISlangMutableFileSystem::getTypeGuid()) ? static_cast<ISlangMutableFileSystem*>(this) : nullptr;
 }
 
 // This is a very awkward hack to make it so we can get a read func, without having to implement all of the tracking etc.
diff --git a/source/slang/slang-check.cpp b/source/slang/slang-check.cpp
index cfc8c504c..600578297 100644
--- a/source/slang/slang-check.cpp
+++ b/source/slang/slang-check.cpp
@@ -18,9 +18,6 @@ namespace Slang
         PassThroughMode compilerType;
     };
 
-    const Guid IID_ISlangSharedLibraryLoader = SLANG_UUID_ISlangSharedLibraryLoader;
-    const Guid IID_ISlangUnknown = SLANG_UUID_ISlangUnknown;
-
     class SinkSharedLibraryLoader : public RefObject, public ISlangSharedLibraryLoader
     {
     public:
@@ -57,7 +54,7 @@ namespace Slang
     protected:
         ISlangUnknown* getInterface(const Guid& guid)
         {
-            return (guid == IID_ISlangUnknown || guid == IID_ISlangSharedLibraryLoader) ? static_cast<ISlangSharedLibraryLoader*>(this) : nullptr;
+            return (guid == ISlangUnknown::getTypeGuid() || guid == ISlangSharedLibraryLoader::getTypeGuid()) ? static_cast<ISlangSharedLibraryLoader*>(this) : nullptr;
         }
         ISlangSharedLibraryLoader* m_loader;
         DiagnosticSink* m_sink;
diff --git a/source/slang/slang-compiler.cpp b/source/slang/slang-compiler.cpp
index c034f5f7d..44cfebf13 100755
--- a/source/slang/slang-compiler.cpp
+++ b/source/slang/slang-compiler.cpp
@@ -185,11 +185,9 @@ namespace Slang
     // EntryPoint
     //
 
-    static const Guid IID_IEntryPoint = SLANG_UUID_IEntryPoint;
-
     ISlangUnknown* EntryPoint::getInterface(const Guid& guid)
     {
-        if(guid == IID_IEntryPoint)
+        if(guid == slang::IEntryPoint::getTypeGuid())
             return static_cast<slang::IEntryPoint*>(this);
 
         return Super::getInterface(guid);
diff --git a/source/slang/slang-compiler.h b/source/slang/slang-compiler.h
index b1e3c3a70..a3eac6fa6 100755
--- a/source/slang/slang-compiler.h
+++ b/source/slang/slang-compiler.h
@@ -37,8 +37,6 @@ namespace Slang
     class TargetRequest;
     class TypeLayout;
 
-    extern const Guid IID_EndToEndCompileRequest;
-
     enum class CompilerMode
     {
         ProduceLibrary,
@@ -1872,9 +1870,6 @@ namespace Slang
         RefPtr<ComponentType> m_program;
     };
 
-    // UUID to identify EndToEndCompileRequest from an interface
-    #define SLANG_UUID_EndToEndCompileRequest { 0xce6d2383, 0xee1b, 0x4fd7, { 0xa0, 0xf, 0xb8, 0xb6, 0x33, 0x12, 0x95, 0xc8 } };
-
         /// A compile request that spans the front and back ends of the compiler
         ///
         /// This is what the command-line `slangc` uses, as well as the legacy
@@ -1886,6 +1881,8 @@ namespace Slang
     class EndToEndCompileRequest : public RefObject, public slang::ICompileRequest
     {
     public:
+        SLANG_CLASS_GUID(0xce6d2383, 0xee1b, 0x4fd7, { 0xa0, 0xf, 0xb8, 0xb6, 0x33, 0x12, 0x95, 0xc8 })
+
         // ISlangUnknown
         SLANG_NO_THROW SlangResult SLANG_MCALL queryInterface(SlangUUID const& uuid, void** outObject) SLANG_OVERRIDE;
         SLANG_REF_OBJECT_IUNKNOWN_ADD_REF
@@ -2402,7 +2399,7 @@ SLANG_FORCE_INLINE EndToEndCompileRequest* asInternal(SlangCompileRequest* reque
     SLANG_ASSERT(request);
     EndToEndCompileRequest* endToEndRequest = nullptr;
     // NOTE! We aren't using to access an interface, so *doesn't* return with a refcount
-    request->queryInterface(IID_EndToEndCompileRequest, (void**)&endToEndRequest);
+    request->queryInterface(EndToEndCompileRequest::getTypeGuid(), (void**)&endToEndRequest);
     SLANG_ASSERT(endToEndRequest);
     return endToEndRequest;
 }
diff --git a/source/slang/slang-dxc-support.cpp b/source/slang/slang-dxc-support.cpp
index 9abc4331e..4e5e4080e 100755
--- a/source/slang/slang-dxc-support.cpp
+++ b/source/slang/slang-dxc-support.cpp
@@ -48,8 +48,7 @@ namespace Slang
     // IDxcIncludeHandler
     // 7f61fc7d-950d-467f-b3e3-3c02fb49187c
     static const Guid IID_IDxcIncludeHandler = { 0x7f61fc7d, 0x950d, 0x467f, { 0x3c, 0x02, 0xfb, 0x49, 0x18, 0x7c } };
-    static const Guid IID_IUnknown = SLANG_UUID_ISlangUnknown;
-
+    
     class DxcIncludeHandler : public IDxcIncludeHandler
     {
     public:
@@ -109,7 +108,7 @@ namespace Slang
         // Used by QueryInterface for casting
         ISlangUnknown* getInterface(const Guid& guid)
         {
-            if (guid == IID_IUnknown || guid == IID_IDxcIncludeHandler)
+            if (guid == ISlangUnknown::getTypeGuid() || guid == IID_IDxcIncludeHandler)
             {
                 return (ISlangUnknown*)(static_cast<IDxcIncludeHandler*>(this));
             }
diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp
index 5c04777de..8c6bf403e 100644
--- a/source/slang/slang.cpp
+++ b/source/slang/slang.cpp
@@ -108,20 +108,6 @@ namespace Slang {
     }
 }
 
-// Allocate static const storage for the various interface IDs that the Slang API needs to expose
-static const Guid IID_IComponentType    = SLANG_UUID_IComponentType;
-static const Guid IID_IEntryPoint       = SLANG_UUID_IEntryPoint;
-static const Guid IID_IGlobalSession    = SLANG_UUID_IGlobalSession;
-static const Guid IID_IModule           = SLANG_UUID_IModule;
-static const Guid IID_ISession          = SLANG_UUID_ISession;
-static const Guid IID_ISlangBlob        = SLANG_UUID_ISlangBlob;
-static const Guid IID_ISlangUnknown     = SLANG_UUID_ISlangUnknown;
-
-static const Guid IID_ICompileRequest   = SLANG_UUID_ICompileRequest;
-
-// Available to other modules so not static
-const Guid IID_EndToEndCompileRequest   = SLANG_UUID_EndToEndCompileRequest;
-
 const char* getBuildTagString()
 {
     return SLANG_TAG_VERSION;
@@ -447,7 +433,7 @@ SlangResult Session::_readBuiltinModule(ISlangFileSystem* fileSystem, Scope* sco
 
 ISlangUnknown* Session::getInterface(const Guid& guid)
 {
-    if(guid == IID_ISlangUnknown || guid == IID_IGlobalSession)
+    if(guid == ISlangUnknown::getTypeGuid() || guid == IGlobalSession::getTypeGuid())
         return asExternal(this);
     return nullptr;
 }
@@ -750,7 +736,7 @@ Linkage::Linkage(Session* session, ASTBuilder* astBuilder, Linkage* builtinLinka
 
 ISlangUnknown* Linkage::getInterface(const Guid& guid)
 {
-    if(guid == IID_ISlangUnknown || guid == IID_ISession)
+    if(guid == ISlangUnknown::getTypeGuid() || guid == ISession::getTypeGuid())
         return asExternal(this);
 
     return nullptr;
@@ -1969,7 +1955,7 @@ EndToEndCompileRequest::EndToEndCompileRequest(
 
 SLANG_NO_THROW SlangResult SLANG_MCALL EndToEndCompileRequest::queryInterface(SlangUUID const& uuid, void** outObject)
 {
-    if (uuid == IID_EndToEndCompileRequest)
+    if (uuid == EndToEndCompileRequest::getTypeGuid())
     {
         // Special case to cast directly into internal type
         // NOTE! No addref(!)
@@ -1977,7 +1963,7 @@ SLANG_NO_THROW SlangResult SLANG_MCALL EndToEndCompileRequest::queryInterface(Sl
         return SLANG_OK;
     }
 
-    if (uuid == IID_ISlangUnknown && uuid == IID_ICompileRequest)
+    if (uuid == ISlangUnknown::getTypeGuid() && uuid == ICompileRequest::getTypeGuid())
     {
         addReference();
         *outObject = static_cast<slang::ICompileRequest*>(this);
@@ -2566,7 +2552,7 @@ Module::Module(Linkage* linkage, ASTBuilder* astBuilder)
 
 ISlangUnknown* Module::getInterface(const Guid& guid)
 {
-    if(guid == IID_IModule)
+    if(guid == IModule::getTypeGuid())
         return asExternal(this);
     return Super::getInterface(guid);
 }
@@ -2711,14 +2697,14 @@ ComponentType* asInternal(slang::IComponentType* inComponentType)
     // (without even `addRef`-ing it).
     //
     ComPtr<slang::IComponentType> componentType;
-    inComponentType->queryInterface(IID_IComponentType, (void**) componentType.writeRef());
+    inComponentType->queryInterface(slang::IComponentType::getTypeGuid(), (void**) componentType.writeRef());
     return static_cast<ComponentType*>(componentType.get());
 }
 
 ISlangUnknown* ComponentType::getInterface(Guid const& guid)
 {
-    if(guid == IID_ISlangUnknown
-        || guid == IID_IComponentType)
+    if(guid == ISlangUnknown::getTypeGuid()
+        || guid == slang::IComponentType::getTypeGuid())
     {
         return static_cast<slang::IComponentType*>(this);
     }
@@ -3632,9 +3618,6 @@ Session* CompileRequestBase::getSession()
     return getLinkage()->getSessionImpl();
 }
 
-static const Slang::Guid IID_ISlangFileSystemExt = SLANG_UUID_ISlangFileSystemExt;
-static const Slang::Guid IID_SlangCacheFileSystem = SLANG_UUID_CacheFileSystem;
-
 void Linkage::setFileSystem(ISlangFileSystem* inFileSystem)
 {
     // Set the fileSystem
@@ -3653,7 +3636,7 @@ void Linkage::setFileSystem(ISlangFileSystem* inFileSystem)
     else
     {
         CacheFileSystem* cacheFileSystemPtr = nullptr;   
-        inFileSystem->queryInterface(IID_SlangCacheFileSystem, (void**)&cacheFileSystemPtr);
+        inFileSystem->queryInterface(CacheFileSystem::getTypeGuid(), (void**)&cacheFileSystemPtr);
         if (cacheFileSystemPtr)
         {
             m_cacheFileSystem = cacheFileSystemPtr;
@@ -3669,7 +3652,7 @@ void Linkage::setFileSystem(ISlangFileSystem* inFileSystem)
             else
             {
                 // See if we have the full ISlangFileSystemExt interface, if we do just use it
-                inFileSystem->queryInterface(IID_ISlangFileSystemExt, (void**)m_fileSystemExt.writeRef());
+                inFileSystem->queryInterface(ISlangFileSystemExt::getTypeGuid(), (void**)m_fileSystemExt.writeRef());
 
                 // If not wrap with CacheFileSystem that emulates ISlangFileSystemExt from the ISlangFileSystem interface
                 if (!m_fileSystemExt)