From 21339e802d77981bbc64cc21cc1315cc41932f35 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Fri, 18 Sep 2020 13:35:45 -0400 Subject: Serialization fixes based on review of #1547 (#1551) * Test if blob is returned. * Rename serialize files so can be grouped. * StringRepresentationCache -> SerialStringTable * Split out SerialStringTable from slang-serialize-ir * First pass at reorganizing serialization/containers. Remain some issues about debug info. * Fix bug in calculating sourceloc. * Improve calcFixSourceLoc * Make allocations for payload RiffContainer align to at least 8 bytes. This is important for read, if the payload can contain 8 byte aligned data. Note this has no effect on Riff file format alignment rules. * Improve comments around RiffContainer and alignment. * Remove SerialStringTable, can just use StringSlicePool instead. * Add flags to control what is output in SerialContainer. Turn off AST output for obfuscated code. Lazily create astClasses when doing write container serialization. * Typo fix for Clang/Linux. * Fixes that came out of review * TranslationUnit -> Module * TargetModule -> TargetComponent * PAYLOAD_MIN_ALIGNMENT -> kPayloadMinAlignment --- source/slang/slang.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/slang/slang.cpp') diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp index 43d1ede7e..fbdbe14b6 100644 --- a/source/slang/slang.cpp +++ b/source/slang/slang.cpp @@ -3039,12 +3039,12 @@ SlangResult _addLibraryReference(EndToEndCompileRequest* req, Stream* stream) SLANG_RETURN_ON_FAIL(SerialContainerUtil::read(&riffContainer, options, containerData)); - for (const auto& translationUnit : containerData.translationUnits) + for (const auto& module : containerData.modules) { // If the irModule is set, add it - if (translationUnit.irModule) + if (module.irModule) { - linkage->m_libModules.add(translationUnit.irModule); + linkage->m_libModules.add(module.irModule); } } -- cgit v1.2.3