auto detection of HEAD of gcc to disable trampolining and old style literals

Author: Hana Dusíková

cpp-20-check.sh

@@ -4,7 +4,8 @@ if echo "" | $1 -std=c++2a -E -x c++ - 2>/dev/null 1>/dev/null; then
 	if [ -z "$VERSION" ]; then
 		echo "-std=c++2a";
 	else
-		echo "-std=c++2a -DEXPERIMENTAL_GCC_9";
+		# -DCTRE_ENABLE_TRAMPOLINING_ON_GCC9
+		echo "-std=c++2a";
 	fi
 else
 	echo "-std=c++17";

include/ctll/parser.hpp

@@ -8,6 +8,13 @@
 
 #include <limits>
 
+// this is disabling TRAMPOLINING for GCC9 which causes ICE
+#if __GNUC__ == 9 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0
+#ifndef CTRE_ENABLE_TRAMPOLINING_ON_GCC9
+#define CTRE_DISABLE_TRAMPOLINING 1 
+#endif
+#endif
+
 namespace ctll {
 
 
@@ -21,7 +28,7 @@ struct placeholder { };
 
 template <size_t> using index_placeholder = placeholder;
 
-#ifdef EXPERIMENTAL_GCC_9
+#ifdef CTRE_DISABLE_TRAMPOLINING
 template <size_t, typename, typename Subject, decision Decision> struct results {
 	constexpr operator bool() const noexcept {
 		return Decision == decision::accept;
@@ -39,7 +46,7 @@ template <typename Grammar, ctll::basic_fixed_string input, typename ActionSelec
 	using Actions = ctll::conditional<IgnoreUnknownActions, ignore_unknown<ActionSelector>, identity<ActionSelector>>;
 	using grammar = augment_grammar<Grammar>;
 
-	#ifndef EXPERIMENTAL_GCC_9
+	#ifndef CTRE_DISABLE_TRAMPOLINING
 	template <size_t Pos, typename Stack, typename Subject, decision Decision> struct results {
 		constexpr inline CTLL_FORCE_INLINE operator bool() const noexcept {
 			return Decision == decision::accept;
@@ -101,7 +108,7 @@ template <typename Grammar, ctll::basic_fixed_string input, typename ActionSelec
 	// if rule is pop_input => move to next character
 	template <size_t Pos, typename Terminal, typename Stack, typename Subject>
 	static constexpr auto move(ctll::pop_input, Terminal, Stack, Subject) noexcept {
-		#ifdef EXPERIMENTAL_GCC_9
+		#ifdef CTRE_DISABLE_TRAMPOLINING
 		return decide<Pos+1>(Stack(), Subject());
 		#else
 		return results<Pos+1, Stack, Subject, decision::undecided>();
@@ -121,7 +128,7 @@ template <typename Grammar, ctll::basic_fixed_string input, typename ActionSelec
 	// and push string without the character (quick LL(1))
 	template <size_t Pos, auto V, typename... Content, typename Stack, typename Subject>
 	static constexpr auto move(push<term<V>, Content...>, term<V>, Stack stack, Subject) noexcept {
-		#ifdef EXPERIMENTAL_GCC_9
+		#ifdef CTRE_DISABLE_TRAMPOLINING
 		return decide<Pos+1>(push_front(list<Content...>(), stack), Subject());
 		#else
 		return results<Pos+1, decltype(push_front(list<Content...>(), stack)), Subject, decision::undecided>();
@@ -131,7 +138,7 @@ template <typename Grammar, ctll::basic_fixed_string input, typename ActionSelec
 	// and push string without the character (quick LL(1))
 	template <size_t Pos, auto V, typename... Content, auto T, typename Stack, typename Subject>
 	static constexpr auto move(push<anything, Content...>, term<T>, Stack stack, Subject) noexcept {
-		#ifdef EXPERIMENTAL_GCC_9
+		#ifdef CTRE_DISABLE_TRAMPOLINING
 		return decide<Pos+1>(push_front(list<Content...>(), stack), Subject());
 		#else
 		return results<Pos+1, decltype(push_front(list<Content...>(), stack)), Subject, decision::undecided>();
@@ -150,7 +157,7 @@ template <typename Grammar, ctll::basic_fixed_string input, typename ActionSelec
 
 			// in case that semantic action is error => reject input
 			if constexpr (std::is_same_v<ctll::reject, decltype(subject)>) {
-				#ifndef EXPERIMENTAL_GCC_9
+				#ifndef CTRE_DISABLE_TRAMPOLINING
 				return results<Pos, Stack, Subject, decision::reject>();
 				#else
 				return results<Pos, Stack, Subject, decision::reject>();
@@ -166,7 +173,7 @@ template <typename Grammar, ctll::basic_fixed_string input, typename ActionSelec
 		}
 	}
 
-	#ifndef EXPERIMENTAL_GCC_9
+	#ifndef CTRE_DISABLE_TRAMPOLINING
 	// trampolines with folded expression
 	template <typename Subject, size_t... Pos> static constexpr auto trampoline_decide(Subject, std::index_sequence<Pos...>) noexcept {
 		// parse everything for first char and than for next and next ...

include/ctre/literals.hpp

@@ -30,7 +30,7 @@ namespace literals {
 #ifdef __INTEL_COMPILER
 // not enable literals
 #elif defined __GNUC__
-#ifndef EXPERIMENTAL_GCC_9
+#if not(__GNUC__ == 9 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0)
 #define CTRE_ENABLE_LITERALS
 #endif
 #endif

tests/many-of-same-proto.cpp

@@ -1,7 +1,7 @@
 #include <ctre.hpp>
 using namespace ctre::test_literals;
 
-#ifndef EXPERIMENTAL_GCC_9 // fixed
+#if not(__GNUC__ == 9 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0)
 #define CTRE_TEST(pattern) static_assert(pattern ## _ctre_test)
 #else
 

tests/matching2.cpp

@@ -1,7 +1,7 @@
 #include <ctre.hpp>
 #include <string_view>
 
-#ifndef EXPERIMENTAL_GCC_9 // fixed
+#if not(__GNUC__ == 9 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0)
 #define CTRE_CREATE(pattern) (pattern ## _ctre)
 #define CTRE_SYNTAX(pattern) (pattern ## _ctre_syntax)
 #else

tests/parsing.cpp

@@ -2,7 +2,7 @@
 
 using namespace ctre::test_literals;
 
-#ifndef EXPERIMENTAL_GCC_9 // fixed
+#if not(__GNUC__ == 9 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0)
 #define CTRE_TEST(pattern) (pattern ## _ctre_test)
 #else
 

tests/trampoline.cpp

@@ -1,7 +1,7 @@
 #include "ctre.hpp"
 
 // GCC9 is crashing with ICE on trampolining mechanism
-#ifndef EXPERIMENTAL_GCC_9
+#if not(__GNUC__ == 9 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0)
 
 static constexpr inline auto pattern = ctll::basic_fixed_string{"(((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((x)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))"};