diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2023-04-19 17:06:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-19 17:06:56 -0400 |
| commit | 588991f6df3d6813378721166a7260990835817e (patch) | |
| tree | fca8c57fedb1967af20ca2da50bbd7dc8afc6a07 /source/slang/slang.cpp | |
| parent | 520a3c064c42e8cd50ef4fde21539870d5b19cb7 (diff) | |
Make SourceMap a value type (#2812)
* #include an absolute path didn't work - because paths were taken to always be relative.
* Moved JSON source map writing logic to JSONSourceMapUtil.
* Use ArtifactHandler to read/write SourceMaps.
Use ObjectCastableAdapter to hold SourceMap
Only serialize SourceMap <-> JSON on demand.
* Make some types swappable.
* BoxValue impl.
* Added asBoxValue.
* Remove const get funcs.
* Fix typo in asBoxValue.
* Fix another typo in asBoxValue.
* Slightly simplify conversion to blob of SourceMap.
* Small fix for asBoxValue
Diffstat (limited to 'source/slang/slang.cpp')
| -rw-r--r-- | source/slang/slang.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp index bedfb1161..6b2814ca7 100644 --- a/source/slang/slang.cpp +++ b/source/slang/slang.cpp @@ -2385,7 +2385,7 @@ void FrontEndCompileRequest::generateIR() if (useSerialIRBottleneck) { // Keep the obfuscated source map (if there is one) - RefPtr<SourceMap> obfuscatedSourceMap = irModule->getObfuscatedSourceMap(); + ComPtr<IBoxValue<SourceMap>> obfuscatedSourceMap(irModule->getObfuscatedSourceMap()); IRSerialData serialData; { @@ -4884,9 +4884,9 @@ SlangResult _addLibraryReference(EndToEndCompileRequest* req, IArtifact* artifac { ComPtr<ICastable> castable; SLANG_RETURN_ON_FAIL(associated->getOrCreateRepresentation(SourceMap::getTypeGuid(), ArtifactKeep::Yes, castable.writeRef())); - - auto sourceMap = as<SourceMap>(castable); - + auto sourceMap = asBoxValue<SourceMap>(castable); + SLANG_ASSERT(sourceMap); + // I guess we add to all ir modules? for (auto irModule : library->m_modules) |