Merge branch 'master' into merge

.github/workflows/benchmark-dev.yml

@@ -1,185 +0,0 @@
-name: benchmark-dev
-
-on:
-  push:
-    branches:
-      - master
-
-    paths-ignore:
-      - "docs/**"
-      - "papers/**"
-      - "rfcs/**"
-      - "*.md"
-
-jobs:
-  windows:
-    name: windows-${{matrix.arch}}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [windows-latest]
-        arch: [Win32, x64]
-        bench:
-          - {
-              script: "run-benchmarks",
-              timeout: 12,
-              title: "Luau Benchmarks",
-            }
-        benchResultsRepo:
-          - { name: "luau-lang/benchmark-data", branch: "main" }
-
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Checkout Luau repository
-        uses: actions/checkout@v3
-
-      - name: Build Luau
-        shell: bash # necessary for fail-fast
-        run: |
-          mkdir build && cd build
-          cmake .. -DCMAKE_BUILD_TYPE=Release
-          cmake --build . --target Luau.Repl.CLI --config Release
-          cmake --build . --target Luau.Analyze.CLI --config Release
-
-      - name: Move build files to root
-        run: |
-          move build/Release/* .
-
-      - uses: actions/setup-python@v3
-        with:
-          python-version: "3.9"
-          architecture: "x64"
-
-      - name: Install python dependencies
-        run: |
-          python -m pip install requests
-          python -m pip install --user numpy scipy matplotlib ipython jupyter pandas sympy nose
-
-      - name: Run benchmark
-        run: |
-          python bench/bench.py | tee ${{ matrix.bench.script }}-output.txt
-
-      - name: Push benchmark results
-        id: pushBenchmarkAttempt1
-        continue-on-error: true
-        uses: ./.github/workflows/push-results
-        with:
-          repository: ${{ matrix.benchResultsRepo.name }}
-          branch: ${{ matrix.benchResultsRepo.branch }}
-          token: ${{ secrets.BENCH_GITHUB_TOKEN }}
-          path: "./gh-pages"
-          bench_name: "${{ matrix.bench.title }} (Windows ${{matrix.arch}})"
-          bench_tool: "benchmarkluau"
-          bench_output_file_path: "./${{ matrix.bench.script }}-output.txt"
-          bench_external_data_json_path: "./gh-pages/dev/bench/data-${{ matrix.os }}.json"
-
-      - name: Push benchmark results (Attempt 2)
-        id: pushBenchmarkAttempt2
-        continue-on-error: true
-        if: steps.pushBenchmarkAttempt1.outcome == 'failure'
-        uses: ./.github/workflows/push-results
-        with:
-          repository: ${{ matrix.benchResultsRepo.name }}
-          branch: ${{ matrix.benchResultsRepo.branch }}
-          token: ${{ secrets.BENCH_GITHUB_TOKEN }}
-          path: "./gh-pages"
-          bench_name: "${{ matrix.bench.title }} (Windows ${{matrix.arch}})"
-          bench_tool: "benchmarkluau"
-          bench_output_file_path: "./${{ matrix.bench.script }}-output.txt"
-          bench_external_data_json_path: "./gh-pages/dev/bench/data-${{ matrix.os }}.json"
-
-      - name: Push benchmark results (Attempt 3)
-        id: pushBenchmarkAttempt3
-        continue-on-error: true
-        if: steps.pushBenchmarkAttempt2.outcome == 'failure'
-        uses: ./.github/workflows/push-results
-        with:
-          repository: ${{ matrix.benchResultsRepo.name }}
-          branch: ${{ matrix.benchResultsRepo.branch }}
-          token: ${{ secrets.BENCH_GITHUB_TOKEN }}
-          path: "./gh-pages"
-          bench_name: "${{ matrix.bench.title }} (Windows ${{matrix.arch}})"
-          bench_tool: "benchmarkluau"
-          bench_output_file_path: "./${{ matrix.bench.script }}-output.txt"
-          bench_external_data_json_path: "./gh-pages/dev/bench/data-${{ matrix.os }}.json"
-
-  unix:
-    name: ${{matrix.os}}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-20.04, macos-latest]
-        bench:
-          - {
-              script: "run-benchmarks",
-              timeout: 12,
-              title: "Luau Benchmarks",
-            }
-        benchResultsRepo:
-          - { name: "luau-lang/benchmark-data", branch: "main" }
-
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Checkout Luau repository
-        uses: actions/checkout@v3
-
-      - name: Build Luau
-        run: make config=release luau luau-analyze
-
-      - uses: actions/setup-python@v3
-        with:
-          python-version: "3.9"
-          architecture: "x64"
-
-      - name: Install python dependencies
-        run: |
-          python -m pip install requests
-          python -m pip install --user numpy scipy matplotlib ipython jupyter pandas sympy nose
-
-      - name: Run benchmark
-        run: |
-          python bench/bench.py | tee ${{ matrix.bench.script }}-output.txt
-
-      - name: Push benchmark results
-        id: pushBenchmarkAttempt1
-        continue-on-error: true
-        uses: ./.github/workflows/push-results
-        with:
-          repository: ${{ matrix.benchResultsRepo.name }}
-          branch: ${{ matrix.benchResultsRepo.branch }}
-          token: ${{ secrets.BENCH_GITHUB_TOKEN }}
-          path: "./gh-pages"
-          bench_name: ${{ matrix.bench.title }}
-          bench_tool: "benchmarkluau"
-          bench_output_file_path: "./${{ matrix.bench.script }}-output.txt"
-          bench_external_data_json_path: "./gh-pages/dev/bench/data-${{ matrix.os }}.json"
-
-      - name: Push benchmark results (Attempt 2)
-        id: pushBenchmarkAttempt2
-        continue-on-error: true
-        if: steps.pushBenchmarkAttempt1.outcome == 'failure'
-        uses: ./.github/workflows/push-results
-        with:
-          repository: ${{ matrix.benchResultsRepo.name }}
-          branch: ${{ matrix.benchResultsRepo.branch }}
-          token: ${{ secrets.BENCH_GITHUB_TOKEN }}
-          path: "./gh-pages"
-          bench_name: ${{ matrix.bench.title }}
-          bench_tool: "benchmarkluau"
-          bench_output_file_path: "./${{ matrix.bench.script }}-output.txt"
-          bench_external_data_json_path: "./gh-pages/dev/bench/data-${{ matrix.os }}.json"
-
-      - name: Push benchmark results (Attempt 3)
-        id: pushBenchmarkAttempt3
-        continue-on-error: true
-        if: steps.pushBenchmarkAttempt2.outcome == 'failure'
-        uses: ./.github/workflows/push-results
-        with:
-          repository: ${{ matrix.benchResultsRepo.name }}
-          branch: ${{ matrix.benchResultsRepo.branch }}
-          token: ${{ secrets.BENCH_GITHUB_TOKEN }}
-          path: "./gh-pages"
-          bench_name: ${{ matrix.bench.title }}
-          bench_tool: "benchmarkluau"
-          bench_output_file_path: "./${{ matrix.bench.script }}-output.txt"
-          bench_external_data_json_path: "./gh-pages/dev/bench/data-${{ matrix.os }}.json"

.github/workflows/push-results/action.yml

@@ -1,63 +0,0 @@
-name: Checkout & push results
-description: Checkout a given repo and push results to GitHub
-inputs:
-  repository:
-    required: true
-    type: string
-    description: The benchmark results repository to check out
-  branch:
-    required: true
-    type: string
-    description: The benchmark results repository's branch to check out
-  token:
-    required: true
-    type: string
-    description: The GitHub token to use for pushing results
-  path:
-    required: true
-    type: string
-    description: The path to check out the results repository to
-  bench_name:
-    required: true
-    type: string
-  bench_tool:
-    required: true
-    type: string
-  bench_output_file_path:
-    required: true
-    type: string
-  bench_external_data_json_path:
-    required: true
-    type: string
-
-runs:
-  using: "composite"
-  steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-      with:
-        repository: ${{ inputs.repository }}
-        ref: ${{ inputs.branch }}
-        token: ${{ inputs.token }}
-        path: ${{ inputs.path }}
-
-    - name: Store results
-      uses: Roblox/rhysd-github-action-benchmark@v-luau
-      with:
-        name: ${{ inputs.bench_name }}
-        tool: ${{ inputs.bench_tool }}
-        gh-pages-branch: ${{ inputs.branch }}
-        output-file-path: ${{ inputs.bench_output_file_path }}
-        external-data-json-path: ${{ inputs.bench_external_data_json_path }}
-
-    - name: Push benchmark results
-      shell: bash
-      run: |
-        echo "Pushing benchmark results..."
-        cd gh-pages
-        git config user.name github-actions
-        git config user.email github@users.noreply.github.com
-        git add *.json
-        git commit -m "Add benchmarks results for ${{ github.sha }}"
-        git push
-        cd ..

.gitignore

@@ -10,4 +10,5 @@
 /luau
 /luau-tests
 /luau-analyze
+/luau-compile
 __pycache__

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

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

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;
 }

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)

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"(