1 files changed, 11 insertions, 14 deletions

diff --git a/source/slang/slang-serialize-source-loc.cpp b/source/slang/slang-serialize-source-loc.cpp
index b24324048..f612a6fb3 100644
--- a/source/slang/slang-serialize-source-loc.cpp
+++ b/source/slang/slang-serialize-source-loc.cpp
@@ -385,47 +385,44 @@ SlangResult SerialSourceLocReader::read(
 
 /* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! DebugSerialData !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
 
-/* static */ Result SerialSourceLocData::writeContainer(RiffContainer* container)
+/* static */ Result SerialSourceLocData::writeTo(RIFF::BuildCursor& cursor)
 {
-    RiffContainer::ScopeChunk debugChunkScope(
-        container,
-        RiffContainer::Chunk::Kind::List,
-        SerialSourceLocData::kDebugFourCc);
+    SLANG_SCOPED_RIFF_BUILDER_LIST_CHUNK(cursor, SerialSourceLocData::kDebugFourCc);
 
     SLANG_RETURN_ON_FAIL(SerialRiffUtil::writeArrayChunk(
         SerialSourceLocData::kDebugStringFourCc,
         m_stringTable,
-        container));
+        cursor));
     SLANG_RETURN_ON_FAIL(SerialRiffUtil::writeArrayChunk(
         SerialSourceLocData::kDebugLineInfoFourCc,
         m_lineInfos,
-        container));
+        cursor));
     SLANG_RETURN_ON_FAIL(SerialRiffUtil::writeArrayChunk(
         SerialSourceLocData::kDebugAdjustedLineInfoFourCc,
         m_adjustedLineInfos,
-        container));
+        cursor));
     SLANG_RETURN_ON_FAIL(SerialRiffUtil::writeArrayChunk(
         SerialSourceLocData::kDebugSourceInfoFourCc,
         m_sourceInfos,
-        container));
+        cursor));
 
     return SLANG_OK;
 }
 
-/* static */ Result SerialSourceLocData::readContainer(RiffContainer::ListChunk* listChunk)
+/* static */ Result SerialSourceLocData::readFrom(RIFF::ListChunk const* listChunk)
 {
-    SLANG_ASSERT(listChunk->getSubType() == SerialSourceLocData::kDebugFourCc);
+    SLANG_ASSERT(listChunk->getType() == SerialSourceLocData::kDebugFourCc);
 
     clear();
-    for (RiffContainer::Chunk* chunk = listChunk->m_containedChunks; chunk; chunk = chunk->m_next)
+    for (auto chunk : listChunk->getChildren())
     {
-        RiffContainer::DataChunk* dataChunk = as<RiffContainer::DataChunk>(chunk);
+        auto dataChunk = as<RIFF::DataChunk>(chunk);
         if (!dataChunk)
         {
             continue;
         }
 
-        switch (dataChunk->m_fourCC)
+        switch (dataChunk->getType())
         {
         case SerialSourceLocData::kDebugStringFourCc:
             {