From a18dca27392b257ba2cc58ceabdf15471f34ee25 Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
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-ast.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source/slang/slang-serialize-ast.cpp')

diff --git a/source/slang/slang-serialize-ast.cpp b/source/slang/slang-serialize-ast.cpp
index b51775710..2465de812 100644
--- a/source/slang/slang-serialize-ast.cpp
+++ b/source/slang/slang-serialize-ast.cpp
@@ -86,6 +86,8 @@ struct ASTFieldAccess
 
         ASTBuilder builder(sharedASTBuilder, "Serialize Check");
 
+        SetASTBuilderContextRAII astBuilderRAII(&builder);
+
         DefaultSerialObjectFactory objectFactory(&builder);
 
         // We could now check that the loaded data matches
-- 
cgit v1.2.3