Sync to upstream Luau 0.635

Fix compilation due to introduction of definitionLocation
JohnnyMorganz · Jul 20, 2024 · 326856e · 326856e
1 parent 9b508f7
commit 326856e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 
+### Changed
+
+- Sync to upstream Luau 0.635
+
 ## [1.32.0] - 2024-07-14
 
 ### Added

diff --git a/luau b/luau
diff --git a/src/platform/roblox/RobloxSourcemap.cpp b/src/platform/roblox/RobloxSourcemap.cpp
@@ -175,13 +175,17 @@ static Luau::TypeId getSourcemapType(const Luau::GlobalTypes& globals, Luau::Typ
             }
 
             // Point the metatable to the metatable of "Instance" so that we allow equality
-            std::optional<Luau::TypeId> instanceMetaIdentity;
-            if (auto* ctv = Luau::get<Luau::ClassType>(instanceTy->type))
-                instanceMetaIdentity = ctv->metatable;
+            auto* instanceCtv = Luau::get<Luau::ClassType>(instanceTy->type);
+            if (!instanceCtv)
+            {
+                ltv.unwrapped = globals.builtinTypes->anyType;
+                return;
+            }
+            std::optional<Luau::TypeId> instanceMetaIdentity = instanceCtv->metatable;
 
             // Create the ClassType representing the instance
             std::string typeName = types::getTypeName(baseTypeId).value_or(node->name);
-            Luau::ClassType baseInstanceCtv{typeName, {}, baseTypeId, instanceMetaIdentity, {}, {}, "@roblox"};
+            Luau::ClassType baseInstanceCtv{typeName, {}, baseTypeId, instanceMetaIdentity, {}, {}, instanceCtv->definitionModuleName, instanceCtv->definitionLocation};
             auto typeId = arena.addType(std::move(baseInstanceCtv));
 
             // Attach Parent and Children info