Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMartin Hořeňovský2020-05-10 10:20:48 +0200
committerMartin Hořeňovský2020-05-10 15:37:29 +0200
commit7efbc83ae0393500692851525b89cfa890f3cee0 (patch)
treeb00e6d57b2753d675fc9201a341c49cb6788cfaf /src
parent9e498278be92ff209687a09b989f27d51aab7809 (diff)
downloadcatch3-7efbc83ae0393500692851525b89cfa890f3cee0.tar.gz
Introduce combined TUs for compiling small TUs
This should improve the compilation times by decreasing the number of TUs compiled, without making overly big TUs that would cause problems with heavy-tailed compilation times. There is one "combined TU" for the top level part, and each subpart, except for Reporters, which currently do not have any trivial TUs.
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt29
-rw-r--r--src/catch2/benchmark/catch_chronometer.cpp14
-rw-r--r--src/catch2/benchmark/detail/catch_benchmark_function.cpp14
-rw-r--r--src/catch2/benchmark/detail/catch_complete_invoke.cpp17
-rw-r--r--src/catch2/benchmark/detail/catch_run_for_at_least.cpp29
-rw-r--r--src/catch2/benchmark/internal/catch_benchmark_combined_tu.cpp88
-rw-r--r--src/catch2/catch_tag_alias_autoregistrar.cpp16
-rw-r--r--src/catch2/generators/catch_generator_exception.cpp14
-rw-r--r--src/catch2/generators/catch_generators.cpp37
-rw-r--r--src/catch2/generators/catch_generators.hpp1
-rw-r--r--src/catch2/generators/internal/catch_generators_combined_tu.cpp58
-rw-r--r--src/catch2/interfaces/catch_interfaces_capture.cpp5
-rw-r--r--src/catch2/interfaces/catch_interfaces_combined_tu.cpp79
-rw-r--r--src/catch2/interfaces/catch_interfaces_config.cpp5
-rw-r--r--src/catch2/interfaces/catch_interfaces_exception.cpp6
-rw-r--r--src/catch2/interfaces/catch_interfaces_registry_hub.cpp6
-rw-r--r--src/catch2/interfaces/catch_interfaces_runner.cpp5
-rw-r--r--src/catch2/interfaces/catch_interfaces_testcase.cpp6
-rw-r--r--src/catch2/internal/catch_combined_tu.cpp173
-rw-r--r--src/catch2/internal/catch_decomposer.cpp24
-rw-r--r--src/catch2/internal/catch_errno_guard.cpp15
-rw-r--r--src/catch2/internal/catch_leak_detector.cpp37
-rw-r--r--src/catch2/internal/catch_polyfills.cpp31
-rw-r--r--src/catch2/internal/catch_startup_exception_registry.cpp26
-rw-r--r--src/catch2/internal/catch_uncaught_exceptions.cpp21
-rw-r--r--src/catch2/matchers/catch_matchers.cpp22
-rw-r--r--src/catch2/matchers/catch_matchers_container_properties.cpp30
-rw-r--r--src/catch2/matchers/catch_matchers_exception.cpp27
-rw-r--r--src/catch2/matchers/catch_matchers_predicate.cpp9
-rw-r--r--src/catch2/matchers/internal/catch_matchers_combined_tu.cpp127
-rw-r--r--src/catch2/matchers/internal/catch_matchers_impl.cpp20
31 files changed, 530 insertions, 461 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9c92cb89..b6578f8b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,10 +24,7 @@ set(BENCHMARK_HEADERS
${SOURCES_DIR}/benchmark/detail/catch_timing.hpp
)
set(BENCHMARK_SOURCES
- ${SOURCES_DIR}/benchmark/catch_chronometer.cpp
- ${SOURCES_DIR}/benchmark/detail/catch_benchmark_function.cpp
- ${SOURCES_DIR}/benchmark/detail/catch_complete_invoke.cpp
- ${SOURCES_DIR}/benchmark/detail/catch_run_for_at_least.cpp
+ ${SOURCES_DIR}/benchmark/internal/catch_benchmark_combined_tu.cpp
${SOURCES_DIR}/benchmark/detail/catch_stats.cpp
)
@@ -134,7 +131,7 @@ set(IMPL_SOURCES
${SOURCES_DIR}/catch_approx.cpp
${SOURCES_DIR}/internal/catch_assertionhandler.cpp
${SOURCES_DIR}/catch_assertion_result.cpp
- ${SOURCES_DIR}/matchers/internal/catch_matchers_impl.cpp
+ ${SOURCES_DIR}/matchers/internal/catch_matchers_combined_tu.cpp
${SOURCES_DIR}/internal/catch_commandline.cpp
${SOURCES_DIR}/internal/catch_common.cpp
${SOURCES_DIR}/catch_config.cpp
@@ -142,34 +139,21 @@ set(IMPL_SOURCES
${SOURCES_DIR}/internal/catch_context.cpp
${SOURCES_DIR}/internal/catch_debug_console.cpp
${SOURCES_DIR}/internal/catch_debugger.cpp
- ${SOURCES_DIR}/internal/catch_decomposer.cpp
${SOURCES_DIR}/internal/catch_enforce.cpp
${SOURCES_DIR}/internal/catch_enum_values_registry.cpp
- ${SOURCES_DIR}/internal/catch_errno_guard.cpp
${SOURCES_DIR}/internal/catch_exception_translator_registry.cpp
${SOURCES_DIR}/internal/catch_fatal_condition_handler.cpp
- ${SOURCES_DIR}/generators/catch_generator_exception.cpp
- ${SOURCES_DIR}/generators/catch_generators.cpp
- ${SOURCES_DIR}/interfaces/catch_interfaces_capture.cpp
- ${SOURCES_DIR}/interfaces/catch_interfaces_config.cpp
- ${SOURCES_DIR}/interfaces/catch_interfaces_exception.cpp
- ${SOURCES_DIR}/interfaces/catch_interfaces_registry_hub.cpp
+ ${SOURCES_DIR}/generators/internal/catch_generators_combined_tu.cpp
+ ${SOURCES_DIR}/interfaces/catch_interfaces_combined_tu.cpp
${SOURCES_DIR}/interfaces/catch_interfaces_reporter.cpp
- ${SOURCES_DIR}/interfaces/catch_interfaces_runner.cpp
- ${SOURCES_DIR}/interfaces/catch_interfaces_testcase.cpp
${SOURCES_DIR}/internal/catch_list.cpp
- ${SOURCES_DIR}/internal/catch_leak_detector.cpp
- ${SOURCES_DIR}/matchers/catch_matchers.cpp
- ${SOURCES_DIR}/matchers/catch_matchers_container_properties.cpp
- ${SOURCES_DIR}/matchers/catch_matchers_exception.cpp
${SOURCES_DIR}/matchers/catch_matchers_floating.cpp
- ${SOURCES_DIR}/matchers/catch_matchers_predicate.cpp
${SOURCES_DIR}/matchers/catch_matchers_string.cpp
${SOURCES_DIR}/matchers/catch_matchers_templated.cpp
${SOURCES_DIR}/catch_message.cpp
${SOURCES_DIR}/internal/catch_output_redirect.cpp
${SOURCES_DIR}/catch_registry_hub.cpp
- ${SOURCES_DIR}/internal/catch_polyfills.cpp
+ ${SOURCES_DIR}/internal/catch_combined_tu.cpp
${SOURCES_DIR}/internal/catch_random_number_generator.cpp
${SOURCES_DIR}/internal/catch_reporter_registry.cpp
${SOURCES_DIR}/internal/catch_result_type.cpp
@@ -177,11 +161,9 @@ set(IMPL_SOURCES
${SOURCES_DIR}/internal/catch_section.cpp
${SOURCES_DIR}/catch_session.cpp
${SOURCES_DIR}/internal/catch_singletons.cpp
- ${SOURCES_DIR}/internal/catch_startup_exception_registry.cpp
${SOURCES_DIR}/internal/catch_stream.cpp
${SOURCES_DIR}/internal/catch_stringref.cpp
${SOURCES_DIR}/internal/catch_string_manip.cpp
- ${SOURCES_DIR}/catch_tag_alias_autoregistrar.cpp
${SOURCES_DIR}/internal/catch_tag_alias_registry.cpp
${SOURCES_DIR}/catch_test_case_info.cpp
${SOURCES_DIR}/internal/catch_test_case_registry_impl.cpp
@@ -192,7 +174,6 @@ set(IMPL_SOURCES
${SOURCES_DIR}/catch_timer.cpp
${SOURCES_DIR}/catch_tostring.cpp
${SOURCES_DIR}/catch_totals.cpp
- ${SOURCES_DIR}/internal/catch_uncaught_exceptions.cpp
${SOURCES_DIR}/catch_version.cpp
${SOURCES_DIR}/internal/catch_wildcard_pattern.cpp
${SOURCES_DIR}/internal/catch_xmlwriter.cpp
diff --git a/src/catch2/benchmark/catch_chronometer.cpp b/src/catch2/benchmark/catch_chronometer.cpp
deleted file mode 100644
index 737c3e13..00000000
--- a/src/catch2/benchmark/catch_chronometer.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Distributed under the Boost Software License, Version 1.0. (See accompanying
- * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- */
-
-#include <catch2/benchmark/catch_chronometer.hpp>
-
-namespace Catch {
- namespace Benchmark {
- namespace Detail {
- ChronometerConcept::~ChronometerConcept() = default;
- } // namespace Detail
- } // namespace Benchmark
-} // namespace Catch
diff --git a/src/catch2/benchmark/detail/catch_benchmark_function.cpp b/src/catch2/benchmark/detail/catch_benchmark_function.cpp
deleted file mode 100644
index a2f3029e..00000000
--- a/src/catch2/benchmark/detail/catch_benchmark_function.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Distributed under the Boost Software License, Version 1.0. (See accompanying
- * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- */
-
-#include <catch2/benchmark/detail/catch_benchmark_function.hpp>
-
-namespace Catch {
- namespace Benchmark {
- namespace Detail {
- BenchmarkFunction::callable::~callable() = default;
- } // namespace Detail
- } // namespace Benchmark
-} // namespace Catch
diff --git a/src/catch2/benchmark/detail/catch_complete_invoke.cpp b/src/catch2/benchmark/detail/catch_complete_invoke.cpp
deleted file mode 100644
index 8fd43d12..00000000
--- a/src/catch2/benchmark/detail/catch_complete_invoke.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Distributed under the Boost Software License, Version 1.0. (See accompanying
- * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- */
-
-#include <catch2/benchmark/detail/catch_complete_invoke.hpp>
-
-namespace Catch {
- namespace Benchmark {
- namespace Detail {
- CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
- CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
- const std::string benchmarkErrorMsg = "a benchmark failed to run successfully";
- CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
- } // namespace Detail
- } // namespace Benchmark
-} // namespace Catch
diff --git a/src/catch2/benchmark/detail/catch_run_for_at_least.cpp b/src/catch2/benchmark/detail/catch_run_for_at_least.cpp
deleted file mode 100644
index f1dcbaba..00000000
--- a/src/catch2/benchmark/detail/catch_run_for_at_least.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Distributed under the Boost Software License, Version 1.0. (See accompanying
- * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- */
-
-// Run a function for a minimum amount of time
-#include <catch2/benchmark/detail/catch_run_for_at_least.hpp>
-
-#include <exception>
-#include <catch2/internal/catch_enforce.hpp>
-
-namespace Catch {
- namespace Benchmark {
- namespace Detail {
- struct optimized_away_error : std::exception {
- const char* what() const noexcept override;
- };
-
- const char* optimized_away_error::what() const noexcept {
- return "could not measure benchmark, maybe it was optimized away";
- }
-
- void throw_optimized_away_error() {
- Catch::throw_exception(optimized_away_error{});
- }
-
- } // namespace Detail
- } // namespace Benchmark
-} // namespace Catch
diff --git a/src/catch2/benchmark/internal/catch_benchmark_combined_tu.cpp b/src/catch2/benchmark/internal/catch_benchmark_combined_tu.cpp
new file mode 100644
index 00000000..02a2855b
--- /dev/null
+++ b/src/catch2/benchmark/internal/catch_benchmark_combined_tu.cpp
@@ -0,0 +1,88 @@
+/** \file
+ * This is a special TU that combines what would otherwise be a very
+ * small benchmarking-related TUs into one bigger TU.
+ *
+ * The reason for this is compilation performance improvements by
+ * avoiding reparsing headers for many small TUs, instead having this
+ * one TU include bit more, but having it all parsed only once.
+ *
+ * To avoid heavy-tail problem with compilation times, each "subpart"
+ * of Catch2 has its own combined TU like this.
+ */
+
+////////////////////////////////////////////
+// vvv formerly catch_chronometer.cpp vvv //
+////////////////////////////////////////////
+
+#include <catch2/benchmark/catch_chronometer.hpp>
+
+namespace Catch {
+ namespace Benchmark {
+ namespace Detail {
+ ChronometerConcept::~ChronometerConcept() = default;
+ } // namespace Detail
+ } // namespace Benchmark
+} // namespace Catch
+
+
+///////////////////////////////////////////////////
+// vvv formerly catch_benchmark_function.cpp vvv //
+///////////////////////////////////////////////////
+
+#include <catch2/benchmark/detail/catch_benchmark_function.hpp>
+
+namespace Catch {
+ namespace Benchmark {
+ namespace Detail {
+ BenchmarkFunction::callable::~callable() = default;
+ } // namespace Detail
+ } // namespace Benchmark
+} // namespace Catch
+
+
+////////////////////////////////////////////////
+// vvv formerly catch_complete_invoke.cpp vvv //
+////////////////////////////////////////////////
+
+#include <catch2/benchmark/detail/catch_complete_invoke.hpp>
+
+namespace Catch {
+ namespace Benchmark {
+ namespace Detail {
+ CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
+ CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
+ const std::string benchmarkErrorMsg = "a benchmark failed to run successfully";
+ CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+ } // namespace Detail
+ } // namespace Benchmark
+} // namespace Catch
+
+
+
+
+/////////////////////////////////////////////////
+// vvv formerly catch_run_for_at_least.cpp vvv //
+/////////////////////////////////////////////////
+
+#include <catch2/benchmark/detail/catch_run_for_at_least.hpp>
+#include <exception>
+#include <catch2/internal/catch_enforce.hpp>
+
+namespace Catch {
+ namespace Benchmark {
+ namespace Detail {
+ struct optimized_away_error : std::exception {
+ const char* what() const noexcept override;
+ };
+
+ const char* optimized_away_error::what() const noexcept {
+ return "could not measure benchmark, maybe it was optimized away";
+ }
+
+ void throw_optimized_away_error() {
+ Catch::throw_exception(optimized_away_error{});
+ }
+
+ } // namespace Detail
+ } // namespace Benchmark
+} // namespace Catch
diff --git a/src/catch2/catch_tag_alias_autoregistrar.cpp b/src/catch2/catch_tag_alias_autoregistrar.cpp
deleted file mode 100644
index ea0e27b0..00000000
--- a/src/catch2/catch_tag_alias_autoregistrar.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <catch2/catch_tag_alias_autoregistrar.hpp>
-#include <catch2/internal/catch_compiler_capabilities.hpp>
-#include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
-
-namespace Catch {
-
- RegistrarForTagAliases::RegistrarForTagAliases(char const* alias, char const* tag, SourceLineInfo const& lineInfo) {
- CATCH_TRY {
- getMutableRegistryHub().registerTagAlias(alias, tag, lineInfo);
- } CATCH_CATCH_ALL {
- // Do not throw when constructing global objects, instead register the exception to be processed later
- getMutableRegistryHub().registerStartupException();
- }
- }
-
-}
diff --git a/src/catch2/generators/catch_generator_exception.cpp b/src/catch2/generators/catch_generator_exception.cpp
deleted file mode 100644
index 446c732a..00000000
--- a/src/catch2/generators/catch_generator_exception.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Distributed under the Boost Software License, Version 1.0. (See accompanying
- * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- */
-
-#include <catch2/generators/catch_generator_exception.hpp>
-
-namespace Catch {
-
- const char* GeneratorException::what() const noexcept {
- return m_msg;
- }
-
-} // end namespace Catch
diff --git a/src/catch2/generators/catch_generators.cpp b/src/catch2/generators/catch_generators.cpp
deleted file mode 100644
index d0c759c4..00000000
--- a/src/catch2/generators/catch_generators.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Created by Phil Nash on 15/6/2018.
- *
- * Distributed under the Boost Software License, Version 1.0. (See accompanying
- * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- */
-
-#include <catch2/generators/catch_generators.hpp>
-#include <catch2/internal/catch_enforce.hpp>
-#include <catch2/generators/catch_generator_exception.hpp>
-#include <catch2/interfaces/catch_interfaces_capture.hpp>
-
-#include <limits>
-#include <set>
-
-namespace Catch {
-
-IGeneratorTracker::~IGeneratorTracker() {}
-
-namespace Generators {
-
-namespace Detail {
-
- [[noreturn]]
- void throw_generator_exception(char const* msg) {
- Catch::throw_exception(GeneratorException{ msg });
- }
-} // end namespace Detail
-
- GeneratorUntypedBase::~GeneratorUntypedBase() {}
-
- auto acquireGeneratorTracker( SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
- return getResultCapture().acquireGeneratorTracker( lineInfo );
- }
-
-} // namespace Generators
-} // namespace Catch
diff --git a/src/catch2/generators/catch_generators.hpp b/src/catch2/generators/catch_generators.hpp
index 60ab4b4f..b1eacd50 100644
--- a/src/catch2/generators/catch_generators.hpp
+++ b/src/catch2/generators/catch_generators.hpp
@@ -12,7 +12,6 @@
#include <memory>
#include <vector>
-#include <cassert>
#include <tuple>
#include <utility>
diff --git a/src/catch2/generators/internal/catch_generators_combined_tu.cpp b/src/catch2/generators/internal/catch_generators_combined_tu.cpp
new file mode 100644
index 00000000..84cf3707
--- /dev/null
+++ b/src/catch2/generators/internal/catch_generators_combined_tu.cpp
@@ -0,0 +1,58 @@
+/** \file
+ * This is a special TU that combines what would otherwise be a very
+ * small generator-related TUs into one bigger TU.
+ *
+ * The reason for this is compilation performance improvements by
+ * avoiding reparsing headers for many small TUs, instead having this
+ * one TU include bit more, but having it all parsed only once.
+ *
+ * To avoid heavy-tail problem with compilation times, each "subpart"
+ * of Catch2 has its own combined TU like this.
+ */
+
+////////////////////////////////////////////////////
+// vvv formerly catch_generator_exception.cpp vvv //
+////////////////////////////////////////////////////
+
+#include <catch2/generators/catch_generator_exception.hpp>
+
+namespace Catch {
+
+ const char* GeneratorException::what() const noexcept {
+ return m_msg;
+ }
+
+} // end namespace Catch
+
+
+///////////////////////////////////////////
+// vvv formerly catch_generators.cpp vvv //
+///////////////////////////////////////////
+
+#include <catch2/generators/catch_generators.hpp>
+#include <catch2/internal/catch_enforce.hpp>
+#include <catch2/generators/catch_generator_exception.hpp>
+#include <catch2/interfaces/catch_interfaces_capture.hpp>
+
+namespace Catch {
+
+IGeneratorTracker::~IGeneratorTracker() {}
+
+namespace Generators {
+
+namespace Detail {
+
+ [[noreturn]]
+ void throw_generator_exception(char const* msg) {
+ Catch::throw_exception(GeneratorException{ msg });
+ }
+} // end namespace Detail
+
+ GeneratorUntypedBase::~GeneratorUntypedBase() {}
+
+ auto acquireGeneratorTracker( SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
+ return getResultCapture().acquireGeneratorTracker( lineInfo );
+ }
+
+} // namespace Generators
+} // namespace Catch
diff --git a/src/catch2/interfaces/catch_interfaces_capture.cpp b/src/catch2/interfaces/catch_interfaces_capture.cpp
deleted file mode 100644
index f49626e0..00000000
--- a/src/catch2/interfaces/catch_interfaces_capture.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <catch2/interfaces/catch_interfaces_capture.hpp>
-
-namespace Catch {
- IResultCapture::~IResultCapture() = default;
-}
diff --git a/src/catch2/interfaces/catch_interfaces_combined_tu.cpp b/src/catch2/interfaces/catch_interfaces_combined_tu.cpp
new file mode 100644
index 00000000..e35b865e
--- /dev/null
+++ b/src/catch2/interfaces/catch_interfaces_combined_tu.cpp
@@ -0,0 +1,79 @@
+/** \file
+ * This is a special TU that combines what would otherwise be a very
+ * small interfaces-related TUs into one bigger TU.
+ *
+ * The reason for this is compilation performance improvements by
+ * avoiding reparsing headers for many small TUs, instead having this
+ * one TU include bit more, but having it all parsed only once.
+ *
+ * To avoid heavy-tail problem with compilation times, each "subpart"
+ * of Catch2 has its own combined TU like this.
+ */
+
+///////////////////////////////////////////////////
+// vvv formerly catch_interfaces_capture.cpp vvv //
+///////////////////////////////////////////////////
+
+#include <catch2/interfaces/catch_interfaces_capture.hpp>
+
+namespace Catch {
+ IResultCapture::~IResultCapture() = default;
+}
+
+
+//////////////////////////////////////////////////
+// vvv formerly catch_interfaces_config.cpp vvv //
+//////////////////////////////////////////////////
+
+#include <catch2/interfaces/catch_interfaces_config.hpp>
+
+namespace Catch {
+ IConfig::~IConfig() = default;
+}
+
+
+/////////////////////////////////////////////////////
+// vvv formerly catch_interfaces_exception.cpp vvv //
+/////////////////////////////////////////////////////
+
+#include <catch2/interfaces/catch_interfaces_exception.hpp>
+
+namespace Catch {
+ IExceptionTranslator::~IExceptionTranslator() = default;
+ IExceptionTranslatorRegistry::~IExceptionTranslatorRegistry() = default;
+}
+
+
+////////////////////////////////////////////////////////
+// vvv formerly catch_interfaces_registry_hub.cpp vvv //
+////////////////////////////////////////////////////////
+
+#include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
+
+namespace Catch {
+ IRegistryHub::~IRegistryHub() = default;
+ IMutableRegistryHub::~IMutableRegistryHub() = default;
+}
+
+
+//////////////////////////////////////////////////
+// vvv formerly catch_interfaces_runner.cpp vvv //
+//////////////////////////////////////////////////
+
+#include <catch2/interfaces/catch_interfaces_runner.hpp>
+
+namespace Catch {
+ IRunner::~IRunner() = default;
+}
+
+
+////////////////////////////////////////////////////
+// vvv formerly catch_interfaces_testcase.cpp vvv //
+////////////////////////////////////////////////////
+
+#include <catch2/interfaces/catch_interfaces_testcase.hpp>
+
+namespace Catch {
+ ITestInvoker::~ITestInvoker() = default;
+ ITestCaseRegistry::~ITestCaseRegistry() = default;
+}
diff --git a/src/catch2/interfaces/catch_interfaces_config.cpp b/src/catch2/interfaces/catch_interfaces_config.cpp
deleted file mode 100644
index b451278c..00000000
--- a/src/catch2/interfaces/catch_interfaces_config.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <catch2/interfaces/catch_interfaces_config.hpp>
-
-namespace Catch {
- IConfig::~IConfig() = default;
-}
diff --git a/src/catch2/interfaces/catch_interfaces_exception.cpp b/src/catch2/interfaces/catch_interfaces_exception.cpp
deleted file mode 100644
index 6d6db336..00000000
--- a/src/catch2/interfaces/catch_interfaces_exception.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <catch2/interfaces/catch_interfaces_exception.hpp>
-
-namespace Catch {
- IExceptionTranslator::~IExceptionTranslator() = default;
- IExceptionTranslatorRegistry::~IExceptionTranslatorRegistry() = default;
-}
diff --git a/src/catch2/interfaces/catch_interfaces_registry_hub.cpp b/src/catch2/interfaces/catch_interfaces_registry_hub.cpp
deleted file mode 100644
index 1dfd0f6f..00000000
--- a/src/catch2/interfaces/catch_interfaces_registry_hub.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
-
-namespace Catch {
- IRegistryHub::~IRegistryHub() = default;
- IMutableRegistryHub::~IMutableRegistryHub() = default;
-}
diff --git a/src/catch2/interfaces/catch_interfaces_runner.cpp b/src/catch2/interfaces/catch_interfaces_runner.cpp
deleted file mode 100644
index a624b639..00000000
--- a/src/catch2/interfaces/catch_interfaces_runner.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <catch2/interfaces/catch_interfaces_runner.hpp>
-
-namespace Catch {
- IRunner::~IRunner() = default;
-}
diff --git a/src/catch2/interfaces/catch_interfaces_testcase.cpp b/src/catch2/interfaces/catch_interfaces_testcase.cpp
deleted file mode 100644
index b43d05c9..00000000
--- a/src/catch2/interfaces/catch_interfaces_testcase.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <catch2/interfaces/catch_interfaces_testcase.hpp>
-
-namespace Catch {
- ITestInvoker::~ITestInvoker() = default;
- ITestCaseRegistry::~ITestCaseRegistry() = default;
-}
diff --git a/src/catch2/internal/catch_combined_tu.cpp b/src/catch2/internal/catch_combined_tu.cpp
new file mode 100644
index 00000000..c6819362
--- /dev/null
+++ b/src/catch2/internal/catch_combined_tu.cpp
@@ -0,0 +1,173 @@
+/** \file
+ * This is a special TU that combines what would otherwise be a very
+ * small top-level TUs into one bigger TU.
+ *
+ * The reason for this is compilation performance improvements by
+ * avoiding reparsing headers for many small TUs, instead having this
+ * one TU include bit more, but having it all parsed only once.
+ *
+ * To avoid heavy-tail problem with compilation times, each "subpart"
+ * of Catch2 has its own combined TU like this.
+ */
+
+
+////////////////////////////////////////////////////////
+// vvv formerly catch_tag_alias_autoregistrar.cpp vvv //
+////////////////////////////////////////////////////////
+
+#include <catch2/catch_tag_alias_autoregistrar.hpp>
+#include <catch2/internal/catch_compiler_capabilities.hpp>
+#include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
+
+namespace Catch {
+
+ RegistrarForTagAliases::RegistrarForTagAliases(char const* alias, char const* tag, SourceLineInfo const& lineInfo) {
+ CATCH_TRY {
+ getMutableRegistryHub().registerTagAlias(alias, tag, lineInfo);
+ } CATCH_CATCH_ALL {
+ // Do not throw when constructing global objects, instead register the exception to be processed later
+ getMutableRegistryHub().registerStartupException();
+ }
+ }
+
+}
+
+
+//////////////////////////////////////////
+// vvv formerly catch_polyfills.cpp vvv //
+//////////////////////////////////////////
+
+#include <catch2/internal/catch_polyfills.hpp>
+#include <catch2/internal/catch_compiler_capabilities.hpp>
+#include <cmath>
+
+namespace Catch {
+
+#if !defined(CATCH_CONFIG_POLYFILL_ISNAN)
+ bool isnan(float f) {
+ return std::isnan(f);
+ }
+ bool isnan(double d) {
+ return std::isnan(d);
+ }
+#else
+ // For now we only use this for embarcadero
+ bool isnan(float f) {
+ return std::_isnan(f);
+ }
+ bool isnan(double d) {
+ return std::_isnan(d);
+ }
+#endif
+
+} // end namespace Catch
+
+
+////////////////////////////////////////////////////
+// vvv formerly catch_uncaught