Tests: Invoke clang frontend instead of cc1 in ClangPlugin tests

Reverts 7fcedae610 at the same time
Author: https://github.com/ADKaster Commit: 27503a5320 Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/4712 Reviewed-by: https://github.com/trflynn89 ✅
2025-09-12 12:32:21 +00:00 · 2025-05-12 13:30:47 -06:00 · 2025-05-12 13:30:47 -06:00 · 27503a5320 · 2025-05-12 20:02:03 +00:00
commit 27503a5320
parent a2167f126d
21 changed files with 20 additions and 22 deletions
--- a/Tests/ClangPlugins/CMakeLists.txt
+++ b/Tests/ClangPlugins/CMakeLists.txt
@ -11,7 +11,6 @@ list(APPEND CLANG_PLUGINS_COMPILE_OPTIONS_FOR_TESTS
    -Wno-literal-range
    -Wno-unknown-warning-option
    -Wno-unqualified-std-cast-call
-    -fgnuc-version=4.2.1 # NOTE: Clang default as of 10.0.0
 )

 # Ensure we always check for invalid function field types regardless of the value of ENABLE_CLANG_PLUGINS_INVALID_FUNCTION_MEMBERS
@ -19,7 +18,6 @@ list(APPEND CLANG_PLUGINS_COMPILE_OPTIONS_FOR_TESTS
 # list(APPEND CLANG_PLUGINS_COMPILE_OPTIONS_FOR_TESTS -fplugin-arg-libjs_gc_scanner-detect-invalid-function-members)

 get_property(CLANG_PLUGINS_INCLUDE_DIRECTORIES TARGET AK PROPERTY INCLUDE_DIRECTORIES)
-list(APPEND CLANG_PLUGINS_INCLUDE_DIRECTORIES ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES})

 configure_lit_site_cfg(
    ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
--- a/Tests/ClangPlugins/LambdaTests/lambda_capture_local_by_ref.cpp
+++ b/Tests/ClangPlugins/LambdaTests/lambda_capture_local_by_ref.cpp
@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-2-Clause
 */

-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1

 #include <AK/Function.h>

--- a/Tests/ClangPlugins/LambdaTests/lambda_capture_local_marked_ignore_by_ref.cpp
+++ b/Tests/ClangPlugins/LambdaTests/lambda_capture_local_marked_ignore_by_ref.cpp
@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-2-Clause
 */

-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1
 // expected-no-diagnostics

 #include <AK/Function.h>
--- a/Tests/ClangPlugins/LibJSGCTests/Macros/classes_are_missing_expected_macros.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/Macros/classes_are_missing_expected_macros.cpp
@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-2-Clause
 */

-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1

 #include <LibGC/ForeignCell.h>
 #include <LibJS/Runtime/PrototypeObject.h>
--- a/Tests/ClangPlugins/LibJSGCTests/Macros/classes_have_expected_macros.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/Macros/classes_have_expected_macros.cpp
@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-2-Clause
 */

-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1
 // expected-no-diagnostics

 #include <LibGC/ForeignCell.h>
--- a/Tests/ClangPlugins/LibJSGCTests/Macros/classes_have_incorrect_macro_types.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/Macros/classes_have_incorrect_macro_types.cpp
@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-2-Clause
 */

-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1

 #include <LibGC/ForeignCell.h>
 #include <LibJS/Runtime/Object.h>
--- a/Tests/ClangPlugins/LibJSGCTests/Macros/nested_macros.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/Macros/nested_macros.cpp
@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-2-Clause
 */

-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1

 #include <LibJS/Runtime/Object.h>

--- a/Tests/ClangPlugins/LibJSGCTests/Macros/wrong_basename_arg.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/Macros/wrong_basename_arg.cpp
@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-2-Clause
 */

-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1

 #include <LibJS/Runtime/Object.h>

--- a/Tests/ClangPlugins/LibJSGCTests/Macros/wrong_classname_arg.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/Macros/wrong_classname_arg.cpp
@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-2-Clause
 */

-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1

 #include <LibGC/ForeignCell.h>
 #include <LibJS/Runtime/PrototypeObject.h>
--- a/Tests/ClangPlugins/LibJSGCTests/calling_base_visit_edges_not_through_using_decl.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/calling_base_visit_edges_not_through_using_decl.cpp
@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-2-Clause
 */

-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1

 #include <LibJS/Runtime/Object.h>

--- a/Tests/ClangPlugins/LibJSGCTests/cell_member_not_wrapped.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/cell_member_not_wrapped.cpp
@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-2-Clause
 */

-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1

 #include <LibJS/Runtime/Object.h>

--- a/Tests/ClangPlugins/LibJSGCTests/gc_allocated_member_is_accessed.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/gc_allocated_member_is_accessed.cpp
@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-2-Clause
 */

-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1
 // expected-no-diagnostics

 #include <LibJS/Runtime/Object.h>
--- a/Tests/ClangPlugins/LibJSGCTests/gc_allocated_member_is_visited.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/gc_allocated_member_is_visited.cpp
@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-2-Clause
 */

-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1
 // expected-no-diagnostics

 #include <LibJS/Runtime/Object.h>
--- a/Tests/ClangPlugins/LibJSGCTests/missing_call_to_base_visit_edges.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/missing_call_to_base_visit_edges.cpp
@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-2-Clause
 */

-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1

 #include <LibJS/Runtime/Object.h>

--- a/Tests/ClangPlugins/LibJSGCTests/missing_member_in_visit_edges.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/missing_member_in_visit_edges.cpp
@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-2-Clause
 */

-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1

 #include <LibJS/Runtime/Object.h>

--- a/Tests/ClangPlugins/LibJSGCTests/missing_visit_edges_method.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/missing_visit_edges_method.cpp
@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-2-Clause
 */

-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1

 #include <LibJS/Runtime/Object.h>

--- a/Tests/ClangPlugins/LibJSGCTests/non_cell_class.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/non_cell_class.cpp
@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-2-Clause
 */

-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1
 // expected-no-diagnostics

 #include <LibJS/Runtime/Object.h>
--- a/Tests/ClangPlugins/LibJSGCTests/not_visiting_rawgcptr.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/not_visiting_rawgcptr.cpp
@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-2-Clause
 */

-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1
 // expected-no-diagnostics

 #include <LibGC/Cell.h>
--- a/Tests/ClangPlugins/LibJSGCTests/strong_root_fields_in_gc_allocated_types.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/strong_root_fields_in_gc_allocated_types.cpp
@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-2-Clause
 */

-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1
 // FIXME: Un-XFAIL this when re-enabling the plugin option in the Tests CMakeLists.txt
 // XFAIL: true

--- a/Tests/ClangPlugins/LibJSGCTests/wrapping_non_cell_member.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/wrapping_non_cell_member.cpp
@ -4,7 +4,7 @@
 * SPDX-License-Identifier: BSD-2-Clause
 */

-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t  2>&1

 #include <LibGC/Ptr.h>
 #include <LibGC/RootVector.h>
--- a/Tests/ClangPlugins/lit.cfg.py
+++ b/Tests/ClangPlugins/lit.cfg.py
@ -18,7 +18,7 @@ config.substitutions.append(("%target_triple", config.target_triple))
 config.substitutions.append(("%PATH%", config.environment["PATH"]))

 plugin_includes = " ".join(f"-I{s}" for s in config.plugin_includes.split(";"))
-plugin_opts = " ".join(s.replace("-fplugin=", "-load ") for s in config.plugin_opts.split(";"))
+plugin_opts = " ".join(s for s in config.plugin_opts.split(";"))
 config.substitutions.append(("%plugin_opts%", f"{plugin_opts} {plugin_includes}"))

 tools = ["clang", "clang++"]