[Clang] Fix crash in CheckNonTypeTemplateParameterType with invalid type

.ci/buildbot/worker.py

@@ -148,7 +148,7 @@ def rmtree(path):
     Taken from official Python docs
     https://docs.python.org/3/library/shutil.html#rmtree-example
     """
-    shutil.rmtree(path, onexc=_remove_readonly)
+    shutil.rmtree(path, onerror=_remove_readonly)
 
 
 def try_delete(path):
@@ -291,6 +291,10 @@ def rmtree(self, *args, **kwargs):
         """Convenience wrapper for rmtree()"""
         return rmtree(*args, *kwargs)
 
+    def try_delete(self, *args, **kwargs):
+        """Convenience wrapper for try_delete()"""
+        return try_delete(*args, *kwargs)
+
     def checkout(self, giturl, sourcepath):
         """Convenience wrapper for checkout()"""
         return checkout(giturl, sourcepath)

.ci/compute_projects.py

@@ -64,15 +64,16 @@
         "mlir",
         "polly",
         "flang",
-        "libclc",
         "openmp",
     },
 }
 
 # This mapping describes runtimes that should be enabled for a specific project,
 # but not necessarily run for testing. The only case of this currently is lldb
 # which needs some runtimes enabled for tests.
-DEPENDENT_RUNTIMES_TO_BUILD = {"lldb": {"libcxx", "libcxxabi", "libunwind"}}
+DEPENDENT_RUNTIMES_TO_BUILD = {
+    "lldb": {"libcxx", "libcxxabi", "libunwind", "compiler-rt"}
+}
 
 # This mapping describes runtimes that should be tested when the key project is
 # touched.
@@ -83,7 +84,7 @@
     "compiler-rt": {"compiler-rt"},
     "flang": {"flang-rt"},
     "flang-rt": {"flang-rt"},
-    ".ci": {"compiler-rt", "libc", "flang-rt"},
+    ".ci": {"compiler-rt", "libc", "flang-rt", "libclc"},
 }
 DEPENDENT_RUNTIMES_TO_TEST_NEEDS_RECONFIG = {
     "llvm": {"libcxx", "libcxxabi", "libunwind"},

.ci/compute_projects_test.py

@@ -285,15 +285,15 @@ def test_ci(self):
         )
         self.assertEqual(
             env_variables["projects_to_build"],
-            "bolt;clang;clang-tools-extra;flang;libclc;lld;lldb;llvm;mlir;polly",
+            "bolt;clang;clang-tools-extra;flang;lld;lldb;llvm;mlir;polly",
         )
         self.assertEqual(
             env_variables["project_check_targets"],
             "check-bolt check-clang check-clang-cir check-clang-tools check-flang check-lld check-lldb check-llvm check-mlir check-polly",
         )
         self.assertEqual(
             env_variables["runtimes_to_build"],
-            "compiler-rt;flang-rt;libc;libcxx;libcxxabi;libunwind",
+            "compiler-rt;flang-rt;libc;libclc;libcxx;libcxxabi;libunwind",
         )
         self.assertEqual(
             env_variables["runtimes_check_targets"],
@@ -310,15 +310,15 @@ def test_windows_ci(self):
         )
         self.assertEqual(
             env_variables["projects_to_build"],
-            "clang;clang-tools-extra;libclc;lld;llvm;mlir;polly",
+            "clang;clang-tools-extra;lld;llvm;mlir;polly",
         )
         self.assertEqual(
             env_variables["project_check_targets"],
             "check-clang check-clang-cir check-clang-tools check-lld check-llvm check-mlir check-polly",
         )
         self.assertEqual(
             env_variables["runtimes_to_build"],
-            "compiler-rt",
+            "compiler-rt;libclc",
         )
         self.assertEqual(
             env_variables["runtimes_check_targets"],
@@ -333,10 +333,10 @@ def test_lldb(self):
         env_variables = compute_projects.get_env_variables(
             ["lldb/CMakeLists.txt"], "Linux"
         )
-        self.assertEqual(env_variables["projects_to_build"], "clang;lldb;llvm")
+        self.assertEqual(env_variables["projects_to_build"], "clang;lld;lldb;llvm")
         self.assertEqual(env_variables["project_check_targets"], "check-lldb")
         self.assertEqual(
-            env_variables["runtimes_to_build"], "libcxx;libcxxabi;libunwind"
+            env_variables["runtimes_to_build"], "compiler-rt;libcxx;libcxxabi;libunwind"
         )
         self.assertEqual(env_variables["runtimes_check_targets"], "")
         self.assertEqual(env_variables["runtimes_check_targets_needs_reconfig"], "")
@@ -359,15 +359,15 @@ def test_premerge_workflow(self):
         )
         self.assertEqual(
             env_variables["projects_to_build"],
-            "bolt;clang;clang-tools-extra;flang;libclc;lld;lldb;llvm;mlir;polly",
+            "bolt;clang;clang-tools-extra;flang;lld;lldb;llvm;mlir;polly",
         )
         self.assertEqual(
             env_variables["project_check_targets"],
             "check-bolt check-clang check-clang-cir check-clang-tools check-flang check-lld check-lldb check-llvm check-mlir check-polly",
         )
         self.assertEqual(
             env_variables["runtimes_to_build"],
-            "compiler-rt;flang-rt;libc;libcxx;libcxxabi;libunwind",
+            "compiler-rt;flang-rt;libc;libclc;libcxx;libcxxabi;libunwind",
         )
         self.assertEqual(
             env_variables["runtimes_check_targets"],
@@ -394,15 +394,15 @@ def test_third_party_benchmark(self):
         )
         self.assertEqual(
             env_variables["projects_to_build"],
-            "bolt;clang;clang-tools-extra;flang;libclc;lld;lldb;llvm;mlir;polly",
+            "bolt;clang;clang-tools-extra;flang;lld;lldb;llvm;mlir;polly",
         )
         self.assertEqual(
             env_variables["project_check_targets"],
             "check-bolt check-clang check-clang-cir check-clang-tools check-flang check-lld check-lldb check-llvm check-mlir check-polly",
         )
         self.assertEqual(
             env_variables["runtimes_to_build"],
-            "compiler-rt;flang-rt;libc;libcxx;libcxxabi;libunwind",
+            "compiler-rt;flang-rt;libc;libclc;libcxx;libcxxabi;libunwind",
         )
         self.assertEqual(
             env_variables["runtimes_check_targets"],

.ci/green-dragon/bisect.groovy

@@ -0,0 +1,191 @@
+branchName = 'main'
+
+library identifier: "zorg-shared-lib@${branchName}",
+        retriever: modernSCM([
+            $class: 'GitSCMSource',
+            remote: "https://github.com/llvm/llvm-zorg.git"
+        ])
+
+pipeline {
+    options {
+        skipDefaultCheckout()
+    }
+
+    agent {
+        node {
+            label 'macos-trigger'
+        }
+    }
+
+    parameters {
+        string(name: 'GOOD_COMMIT', description: 'Known good commit SHA', defaultValue: '')
+        string(name: 'BAD_COMMIT', description: 'Known bad commit SHA', defaultValue: '')
+        choice(
+            name: 'TEST_JOB_NAME',
+            choices: [
+              'clang-stage1-RA',
+              'clang-stage1-RA-cmake-incremental',
+              'clang-stage1-RA-expensive',
+              'clang-stage1-RA-as',
+              'clang-san-iossim',
+              'clang-stage2-cmake-RgSan',
+              'clang-stage2-cmake-RgTSan',
+              'clang-stage2-Rthinlto',
+            ],
+            description: 'Job to execute for testing each commit'
+        )
+        choice(
+            name: 'REPOSITORY',
+            choices: ['llvm-project'],
+            description: 'Repository to bisect'
+        )
+        booleanParam(name: 'RUN_TESTS', defaultValue: true, description: 'Run tests as part of bisection. Set to False if bisecting a build failure.')
+        string(name: 'SESSION_ID', description: 'Session ID to continue (optional)', defaultValue: '')
+        booleanParam(name: 'DRY_RUN', defaultValue: false, description: 'Dry run mode')
+        string(name: 'REQUESTOR', description: 'Email address of the requestor', defaultValue: '')
+    }
+
+    stages {
+        stage('Validate Parameters') {
+            steps {
+                script {
+                    if (!params.GOOD_COMMIT || !params.BAD_COMMIT) {
+                        error("Both GOOD_COMMIT and BAD_COMMIT parameters are required")
+                    }
+                    if (!params.TEST_JOB_NAME) {
+                        error("TEST_JOB_NAME parameter is required")
+                    }
+                }
+            }
+        }
+
+        stage('Setup Repository') {
+            steps {
+                script {
+                    echo "📁 Setting up repository: ${params.REPOSITORY}..."
+
+                    dir(params.REPOSITORY) {
+                        // Clone or checkout the repository
+                        checkout([$class: 'GitSCM', branches: [
+                            [name: params.GOOD_COMMIT]
+                        ], extensions: [
+                            [$class: 'CloneOption',
+                            timeout: 30]
+                        ], userRemoteConfigs: [
+                            [url: 'https://github.com/llvm/llvm-project.git']
+                        ]])
+
+                        // Verify commits exist
+                        sh "git cat-file -e ${params.GOOD_COMMIT}"
+                        sh "git cat-file -e ${params.BAD_COMMIT}"
+
+                        echo "Repository setup complete"
+                    }
+                }
+            }
+        }
+
+        stage('Initialize Bisection') {
+            steps {
+                script {
+                    bisectionManager.initializeBisection(
+                        params.GOOD_COMMIT,
+                        params.BAD_COMMIT,
+                        params.TEST_JOB_NAME,
+                        params.REPOSITORY,
+                        params.SESSION_ID ?: null
+                    )
+                }
+            }
+        }
+
+        stage('Execute Bisection') {
+            steps {
+                script {
+                    def stepNumber = 1
+                    def maxSteps = 50
+
+                    while (stepNumber <= maxSteps) {
+                        // Log step and get info
+                        def stepInfo = bisectionManager.logStepStart(stepNumber, params.REPOSITORY)
+
+                        if (stepInfo.type == 'complete') {
+                            echo "Bisection complete! Failing commit: ${stepInfo.failing_commit}"
+                            break
+                        }
+
+                        // Show restart instructions
+                        bisectionManager.showRestartInstructions(stepNumber, params.TEST_JOB_NAME, params.REPOSITORY)
+
+                        if (params.DRY_RUN) {
+                            def simulatedResult = (stepNumber % 2 == 0) ? "SUCCESS" : "FAILURE"
+                            echo "Simulated result: ${simulatedResult}"
+                            bisectionManager.recordTestResult(stepInfo.commit, simulatedResult, params.REPOSITORY)
+                        } else {
+                            // Execute real job
+                            def startTime = System.currentTimeMillis()
+
+                            def jobResult = build(
+                                job: "llvm.org/bisect/${params.TEST_JOB_NAME}",
+                                parameters: [
+                                    string(name: 'GIT_SHA', value: stepInfo.commit),
+                                    string(name: 'BISECT_GOOD', value: stepInfo.bisection_range.current_good),
+                                    string(name: 'BISECT_BAD', value: stepInfo.bisection_range.current_bad),
+                                    booleanParam(name: 'IS_BISECT_JOB', value: true),
+                                    booleanParam(name: 'SKIP_TESTS', value: !params.RUN_TESTS),
+                                    booleanParam(name: 'SKIP_TRIGGER', value: true)
+                                ],
+                                propagate: false,
+                                wait: true
+                            )
+
+                            def duration = ((System.currentTimeMillis() - startTime) / 1000.0) as double
+
+                            // Log the job execution
+                            bisectionManager.logJobExecution(
+                                params.TEST_JOB_NAME,
+                                jobResult.result,
+                                duration,
+                                jobResult.absoluteUrl,
+                                jobResult.number.toString(),
+                                params.REPOSITORY
+                            )
+
+                            // Record the test result
+                            bisectionManager.recordTestResult(stepInfo.commit, jobResult.result, params.REPOSITORY)
+                        }
+
+                        stepNumber++
+                        sleep(2)
+                    }
+
+                    if (stepNumber > maxSteps) {
+                        error("Bisection exceeded maximum steps")
+                    }
+                }
+            }
+        }
+
+        stage('Final Report') {
+            steps {
+                script {
+                    bisectionManager.generateFinalReport(params.REPOSITORY)
+                }
+            }
+        }
+    }
+
+    post {
+        always {
+            script {
+                bisectionManager.displaySummary(params.REPOSITORY)
+                archiveArtifacts artifacts: "bisection_state.json,bisection.log,restart_instructions.log,bisection_final_report.txt",
+                                allowEmptyArchive: true
+            }
+        }
+        cleanup {
+            // Clean up but preserve artifacts
+            sh 'rm -f bisection_manager.py'
+        }
+    }
+}

.ci/green-dragon/clang-san-iossim.groovy

@@ -0,0 +1,73 @@
+branchName = 'main'
+
+library identifier: "zorg-shared-lib@${branchName}",
+        retriever: modernSCM([
+            $class: 'GitSCMSource',
+            remote: "https://github.com/llvm/llvm-zorg.git",
+            credentialsId: scm.userRemoteConfigs[0].credentialsId
+        ])
+
+clangPipeline(
+    jobName: env.JOB_NAME,
+    zorgBranch: branchName,
+    buildConfig: [
+        stage: 1,
+        build_type: 'cmake',
+        cmake_type: 'RelWithDebInfo',
+        assertions: true,
+        projects: 'clang;clang-tools-extra',
+        runtimes: 'compiler-rt',
+        timeout: 120,
+        incremental: false,
+        env_vars: [
+            "MACOSX_DEPLOYMENT_TARGET": "10.14"
+        ]
+    ],
+    testConfig: [
+        timeout: 90,
+        env_vars: [
+            "SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER": "iPhone 15"
+        ],
+        custom_script: '''
+            EXIT_CODE=0
+            export COMPILER_RT_TEST_DIR="$WORKSPACE/clang-build/runtimes/runtimes-bins/compiler-rt/test"
+
+            cd $COMPILER_RT_TEST_DIR/asan && python3 $WORKSPACE/clang-build/./bin/llvm-lit \
+              --xunit-xml-output=testresults-asan-IOSSimX86_64Config.xunit.xml -v -vv --timeout=600 \
+              $COMPILER_RT_TEST_DIR/asan/IOSSimX86_64Config/ || EXIT_CODE=1
+
+            cd $COMPILER_RT_TEST_DIR/tsan && python3 $WORKSPACE/clang-build/./bin/llvm-lit \
+              --xunit-xml-output=testresults-tsan-IOSSimX86_64Config.xunit.xml -v -vv --timeout=600 \
+              $COMPILER_RT_TEST_DIR/tsan/IOSSimX86_64Config/ || EXIT_CODE=1
+
+            cd $COMPILER_RT_TEST_DIR/ubsan && python3 $WORKSPACE/clang-build/./bin/llvm-lit \
+              --xunit-xml-output=testresults-ubsan-AddressSanitizer-iossim-x86_64.xunit.xml -v -vv --timeout=600 \
+              $COMPILER_RT_TEST_DIR/ubsan/AddressSanitizer-iossim-x86_64/ || EXIT_CODE=1
+
+            cd $COMPILER_RT_TEST_DIR/ubsan && python3 $WORKSPACE/clang-build/./bin/llvm-lit \
+              --xunit-xml-output=testresults-ubsan-Standalone-iossim-x86_64.xunit.xml -v -vv --timeout=600 \
+              $COMPILER_RT_TEST_DIR/ubsan/Standalone-iossim-x86_64/ || EXIT_CODE=1
+
+            cd $COMPILER_RT_TEST_DIR/ubsan && python3 $WORKSPACE/clang-build/./bin/llvm-lit \
+              --xunit-xml-output=testresults-ubsan-ThreadSanitizer-iossim-x86_64.xunit.xml -v -vv --timeout=600 \
+              $COMPILER_RT_TEST_DIR/ubsan/ThreadSanitizer-iossim-x86_64/ || EXIT_CODE=1
+
+            cd $COMPILER_RT_TEST_DIR/sanitizer_common && python3 $WORKSPACE/clang-build/./bin/llvm-lit \
+              --xunit-xml-output=testresults-sanitizer_common-asan-iossim-x86_64.xunit.xml -v -vv --timeout=600 \
+              $COMPILER_RT_TEST_DIR/sanitizer_common/asan-x86_64-iossim/ || EXIT_CODE=1
+
+            cd $COMPILER_RT_TEST_DIR/sanitizer_common && python3 $WORKSPACE/clang-build/./bin/llvm-lit \
+              --xunit-xml-output=testresults-sanitizer_common-tsan-iossim-x86_64.xunit.xml -v -vv --timeout=600 \
+              $COMPILER_RT_TEST_DIR/sanitizer_common/tsan-x86_64-iossim/ || EXIT_CODE=1
+
+            cd $COMPILER_RT_TEST_DIR/sanitizer_common && python3 $WORKSPACE/clang-build/./bin/llvm-lit \
+              --xunit-xml-output=testresults-sanitizer_common-ubsan-iossim-x86_64.xunit.xml -v -vv --timeout=600 \
+              $COMPILER_RT_TEST_DIR/sanitizer_common/ubsan-x86_64-iossim/ || EXIT_CODE=1
+
+            exit $EXIT_CODE
+        ''',
+        junit_patterns: [
+            "clang-build/**/testresults-*.xunit.xml"
+        ]
+    ]
+)