From 2b03c8f72a2a39bb9159e52268f1f8777797dfa6 Mon Sep 17 00:00:00 2001
From: LoganDark <git@logandark.mozmail.com>
Date: Mon, 7 Aug 2023 13:45:04 -0700
Subject: [PATCH] Use `const char* const*` over `const char**` (#1005)

The FFI difference becomes significant in languages like Rust where you
can't necessarily just cast a const pointer.
---
 Compiler/include/Luau/Compiler.h | 2 +-
 Compiler/include/luacode.h       | 2 +-
 Compiler/src/ValueTracking.cpp   | 4 ++--
 Compiler/src/ValueTracking.h     | 2 +-
 tests/Compiler.test.cpp          | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Compiler/include/Luau/Compiler.h b/Compiler/include/Luau/Compiler.h
index 36a21a72..9a661db2 100644
--- a/Compiler/include/Luau/Compiler.h
+++ b/Compiler/include/Luau/Compiler.h
@@ -39,7 +39,7 @@ struct CompileOptions
     const char* vectorType = nullptr;
 
     // null-terminated array of globals that are mutable; disables the import optimization for fields accessed through these
-    const char** mutableGlobals = nullptr;
+    const char* const* mutableGlobals = nullptr;
 };
 
 class CompileError : public std::exception
diff --git a/Compiler/include/luacode.h b/Compiler/include/luacode.h
index 7c59ce0b..60cdeee7 100644
--- a/Compiler/include/luacode.h
+++ b/Compiler/include/luacode.h
@@ -35,7 +35,7 @@ struct lua_CompileOptions
     const char* vectorType;
 
     // null-terminated array of globals that are mutable; disables the import optimization for fields accessed through these
-    const char** mutableGlobals;
+    const char* const* mutableGlobals;
 };
 
 // compile source to bytecode; when source compilation fails, the resulting bytecode contains the encoded error. use free() to destroy
diff --git a/Compiler/src/ValueTracking.cpp b/Compiler/src/ValueTracking.cpp
index 0bfaf9b3..616fca99 100644
--- a/Compiler/src/ValueTracking.cpp
+++ b/Compiler/src/ValueTracking.cpp
@@ -82,13 +82,13 @@ struct ValueVisitor : AstVisitor
     }
 };
 
-void assignMutable(DenseHashMap<AstName, Global>& globals, const AstNameTable& names, const char** mutableGlobals)
+void assignMutable(DenseHashMap<AstName, Global>& globals, const AstNameTable& names, const char* const* mutableGlobals)
 {
     if (AstName name = names.get("_G"); name.value)
         globals[name] = Global::Mutable;
 
     if (mutableGlobals)
-        for (const char** ptr = mutableGlobals; *ptr; ++ptr)
+        for (const char* const* ptr = mutableGlobals; *ptr; ++ptr)
             if (AstName name = names.get(*ptr); name.value)
                 globals[name] = Global::Mutable;
 }
diff --git a/Compiler/src/ValueTracking.h b/Compiler/src/ValueTracking.h
index fc74c84a..f8ecc6b8 100644
--- a/Compiler/src/ValueTracking.h
+++ b/Compiler/src/ValueTracking.h
@@ -28,7 +28,7 @@ struct Variable
     bool constant = false;   // is the variable's value a compile-time constant? filled by constantFold
 };
 
-void assignMutable(DenseHashMap<AstName, Global>& globals, const AstNameTable& names, const char** mutableGlobals);
+void assignMutable(DenseHashMap<AstName, Global>& globals, const AstNameTable& names, const char* const* mutableGlobals);
 void trackValues(DenseHashMap<AstName, Global>& globals, DenseHashMap<AstLocal*, Variable>& variables, AstNode* root);
 
 inline Global getGlobalState(const DenseHashMap<AstName, Global>& globals, AstName name)
diff --git a/tests/Compiler.test.cpp b/tests/Compiler.test.cpp
index d368af66..fa5ab7e6 100644
--- a/tests/Compiler.test.cpp
+++ b/tests/Compiler.test.cpp
@@ -4213,7 +4213,7 @@ RETURN R0 0
     bcb.setDumpFlags(Luau::BytecodeBuilder::Dump_Code);
     Luau::CompileOptions options;
     const char* mutableGlobals[] = {"Game", "Workspace", "game", "plugin", "script", "shared", "workspace", NULL};
-    options.mutableGlobals = &mutableGlobals[0];
+    options.mutableGlobals = mutableGlobals;
     Luau::compileOrThrow(bcb, source, options);
 
     CHECK_EQ("\n" + bcb.dumpFunction(0), R"(