From a18dca27392b257ba2cc58ceabdf15471f34ee25 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Tue, 26 Sep 2023 15:40:22 -0400 Subject: Fix for epoch/ASTBuilder* nullptr issue (#3240) * Fix issue with failing tests tests/serialization/serialized-module-test.slang tests/serialization/extern/extern-test.slang * Fix issue with session destruction order on Session. * Improve comment. --- source/slang/slang-serialize-container.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source/slang/slang-serialize-container.cpp') diff --git a/source/slang/slang-serialize-container.cpp b/source/slang/slang-serialize-container.cpp index 263abf465..175f970c9 100644 --- a/source/slang/slang-serialize-container.cpp +++ b/source/slang/slang-serialize-container.cpp @@ -390,6 +390,9 @@ static List& _getCandidateExtensionList( astBuilder = new ASTBuilder(options.sharedASTBuilder, buf.produceString()); } + /// We need to make the current ASTBuilder available for access via thread_local global. + SetASTBuilderContextRAII astBuilderRAII(astBuilder); + DefaultSerialObjectFactory objectFactory(astBuilder); SerialReader reader(serialClasses, &objectFactory); -- cgit v1.2.3