Merge branch 'master' into loop_attrib

1 files changed, 7 insertions, 5 deletions

diff --git a/source/slang/slang-ast-builder.cpp b/source/slang/slang-ast-builder.cpp
index 316390353..67ce80120 100644
--- a/source/slang/slang-ast-builder.cpp
+++ b/source/slang/slang-ast-builder.cpp
@@ -21,18 +21,20 @@ void SharedASTBuilder::init(Session* session)
     m_session = session;
 
     // We just want as a place to store allocations of shared types
-    RefPtr<ASTBuilder> astBuilder(new ASTBuilder);
-
-    astBuilder->m_sharedASTBuilder = this;
+    {
+        RefPtr<ASTBuilder> astBuilder(new ASTBuilder);
+        astBuilder->m_sharedASTBuilder = this;
+        m_astBuilder = astBuilder.detach();
+    }
 
+    // Clear the built in types
     memset(m_builtinTypes, 0, sizeof(m_builtinTypes));
 
+    // Create common shared types
     m_errorType = m_astBuilder->create<ErrorType>();
     m_initializerListType = m_astBuilder->create<InitializerListType>();
     m_overloadedType = m_astBuilder->create<OverloadGroupType>();
 
-    m_astBuilder = astBuilder.detach();
-
     // We can just iterate over the class pointers.
     // NOTE! That this adds the names of the abstract classes too(!)
     for (Index i = 0; i < Index(ASTNodeType::CountOf); ++i)