2 files changed, 87 insertions, 0 deletions

diff --git a/source/compiler-core/slang-json-value.cpp b/source/compiler-core/slang-json-value.cpp
index 216512407..ba4ccad09 100644
--- a/source/compiler-core/slang-json-value.cpp
+++ b/source/compiler-core/slang-json-value.cpp
@@ -401,6 +401,82 @@ bool JSONContainer::asBool(const JSONValue& value)
     }
 }
 
+JSONValue JSONContainer::asValue(const JSONValue& inValue)
+{
+    JSONValue value = inValue;
+    switch (value.type)
+    {
+        case JSONValue::Type::StringLexeme:
+        {
+            const UnownedStringSlice slice = getTransientString(inValue);
+            value.stringKey = getKey(slice);
+            value.type = JSONValue::Type::StringValue;
+            break;
+        }
+        case JSONValue::Type::IntegerLexeme:
+        {
+            value.floatValue = value.asFloat();
+            value.type = JSONValue::Type::IntegerValue;
+            break;
+        }
+        case JSONValue::Type::FloatLexeme:
+        {
+            value.floatValue = value.asFloat();
+            value.type = JSONValue::Type::FloatValue;
+            break;
+        }
+        default: break;
+    }
+
+    return value;
+}
+
+void JSONContainer::_clearSourceManagerDependency(JSONValue* ioValues, Index count)
+{
+    for (Index i = 0; i < count; ++i)
+    {
+        auto& value = ioValues[i];
+        value = asValue(value);
+        value.loc = SourceLoc();
+    }
+}
+
+void JSONContainer::clearSourceManagerDependency(JSONValue* ioValues, Index valuesCount)
+{
+    _clearSourceManagerDependency(ioValues, valuesCount);
+
+    // We need to find ranges that are available
+    for (auto& range : m_ranges)
+    {
+        switch (range.type)
+        {
+            case Range::Type::Array:
+            {
+                _clearSourceManagerDependency(m_arrayValues.getBuffer() + range.startIndex, range.count);
+                break;
+            }
+            case Range::Type::Object:
+            {
+                const Index count = range.count;
+                auto pairs = m_objectValues.getBuffer() + range.startIndex;
+
+                for (Index i = 0; i < count; ++i)
+                {
+                    auto& pair = pairs[i];
+                    pair.keyLoc = SourceLoc();
+                    pair.value = asValue(pair.value);
+                    pair.value.loc = SourceLoc();
+                }
+                break;
+            }
+            default: break;
+        }
+    }
+
+    // Remove the source manager
+    m_sourceManager = nullptr;
+}
+
 int64_t JSONContainer::asInteger(const JSONValue& value)
 {
     switch (value.type)
diff --git a/source/compiler-core/slang-json-value.h b/source/compiler-core/slang-json-value.h
index b94283d81..2e8707a87 100644
--- a/source/compiler-core/slang-json-value.h
+++ b/source/compiler-core/slang-json-value.h
@@ -233,9 +233,17 @@ public:
         /// Set the source manager
     void setSourceManager(SourceManager* sourceManger) { m_sourceManager = sourceManger;  }
 
+        /// Clears all the source locs. Useful if the sourceManager is no longer available, or has itself been reset.
+        /// All JSONValues which were Lexeme based will become held in the container
+        /// The source manager will set to nullptr
+    void clearSourceManagerDependency(JSONValue* ioValues, Index count);
+
         /// Reset the state
     void reset();
 
+        /// Return inValue as a regular value (ie not held as a lexeme)
+    JSONValue asValue(const JSONValue& inValue);
+
         // Ctor
     JSONContainer(SourceManager* sourceManger);
 
@@ -278,6 +286,9 @@ protected:
         /// True if the key and value are equal
     bool _areEqualOrderedKeys(const JSONKeyValue* a, const JSONKeyValue* b, Index count);
 
+    void _clearSourceManagerDependency(JSONValue* ioValues, Index count);
+    JSONValue _removeManagerDependency(const JSONValue& inValue);
+
     StringBuilder m_buf;                        ///< A temporary buffer used to hold unescaped strings
 
     SourceView* m_currentView = nullptr;