3 files changed, 4 insertions, 10 deletions
diff --git a/source/slang/slang-compiler.h b/source/slang/slang-compiler.h
index 6054492bc..d45e796d9 100644
--- a/source/slang/slang-compiler.h
+++ b/source/slang/slang-compiler.h
@@ -2353,9 +2353,9 @@ public:
     StringSlicePool m_stringSlicePool;
 
     // Name pool for looking up names
-    NamePool namePool;
+    NamePool* namePool = nullptr;
 
-    NamePool* getNamePool() { return &namePool; }
+    NamePool* getNamePool() { return namePool; }
 
     ASTBuilder* getASTBuilder() { return m_astBuilder; }
 
@@ -3740,10 +3740,8 @@ public:
 
     // Name pool stuff for unique-ing identifiers
 
-    RootNamePool rootNamePool;
     NamePool namePool;
 
-    RootNamePool* getRootNamePool() { return &rootNamePool; }
     NamePool* getNamePool() { return &namePool; }
     Name* getNameObj(String name) { return namePool.getName(name); }
     Name* tryGetNameObj(String name) { return namePool.tryGetName(name); }
diff --git a/source/slang/slang-language-server-auto-format.cpp b/source/slang/slang-language-server-auto-format.cpp
index b7f601bc2..a65eb64ec 100644
--- a/source/slang/slang-language-server-auto-format.cpp
+++ b/source/slang/slang-language-server-auto-format.cpp
@@ -77,9 +77,7 @@ List<TextRange> extractFormattingExclusionRanges(UnownedStringSlice text)
     auto sourceFile = manager.createSourceFileWithString(PathInfo(), text);
     auto sourceView = manager.createSourceView(sourceFile, nullptr, SourceLoc());
     DiagnosticSink sink;
-    RootNamePool rootPool;
     NamePool namePool;
-    namePool.setRootNamePool(&rootPool);
     MemoryArena memory;
     memory.init(1 << 16);
     lexer.initialize(sourceView, &sink, &namePool, &memory);
diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp
index 090e34e9a..f65681e4b 100644
--- a/source/slang/slang.cpp
+++ b/source/slang/slang.cpp
@@ -167,8 +167,6 @@ void Session::init()
     DownstreamCompilerUtil::setDefaultLocators(m_downstreamCompilerLocators);
     m_downstreamCompilerSet = new DownstreamCompilerSet;
 
-    // Initialize name pool
-    getNamePool()->setRootNamePool(getRootNamePool());
     m_completionTokenName = getNamePool()->getName("#?");
 
     m_sharedLibraryLoader = DefaultSharedLibraryLoader::getSingleton();
@@ -1370,7 +1368,7 @@ Linkage::Linkage(Session* session, ASTBuilder* astBuilder, Linkage* builtinLinka
     , m_cmdLineContext(new CommandLineContext())
     , m_stringSlicePool(StringSlicePool::Style::Default)
 {
-    getNamePool()->setRootNamePool(session->getRootNamePool());
+    namePool = session->getNamePool();
 
     m_defaultSourceManager.initialize(session->getBuiltinSourceManager(), nullptr);
 
@@ -3601,7 +3599,7 @@ void FrontEndCompileRequest::parseTranslationUnit(TranslationUnitRequest* transl
 #if 0
             // Test serialization
             {
-                ASTSerialTestUtil::testSerialize(translationUnit->getModuleDecl(), getSession()->getRootNamePool(), getLinkage()->getASTBuilder()->getSharedASTBuilder(), getSourceManager());
+                ASTSerialTestUtil::testSerialize(translationUnit->getModuleDecl(), getSession()->getNamePool(), getLinkage()->getASTBuilder()->getSharedASTBuilder(), getSourceManager());
             }
 #endif
     }