summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2021-04-29 17:53:07 +0900
committernagachika <nagachika@ruby-lang.org>2021-04-29 17:53:07 +0900
commit3e07a4edc92f18dec4806961c1b724ac5cf4d6b2 (patch)
treefb9c5ddfa9864de73f6e763ce28d18c6e002764a
parentcc4e602634e894c831a4103a5803a3de566c1856 (diff)
merge revision(s) 3a3033c138c0951ad5edbf02b5c233b58a190d2f: [Backport #17787]
get rid of using `__builtin_unreachable` directly [Bug #17787] As it is an independent feature from `clz`, `ctz` and `popcount`, it might be unavailable even if the latters are built in. --- internal/bits.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
-rw-r--r--internal/bits.h6
-rw-r--r--version.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/internal/bits.h b/internal/bits.h
index a7ddcaeb78..746947bfc2 100644
--- a/internal/bits.h
+++ b/internal/bits.h
@@ -284,7 +284,7 @@ nlz_int64(uint64_t x)
}
else {
/* :FIXME: Is there a way to make this branch a compile-time error? */
- __builtin_unreachable();
+ UNREACHABLE_RETURN(~0);
}
#else
@@ -419,7 +419,7 @@ rb_popcount64(uint64_t x)
}
else {
/* :FIXME: Is there a way to make this branch a compile-time error? */
- __builtin_unreachable();
+ UNREACHABLE_RETURN(~0);
}
#else
@@ -492,7 +492,7 @@ ntz_int64(uint64_t x)
}
else {
/* :FIXME: Is there a way to make this branch a compile-time error? */
- __builtin_unreachable();
+ UNREACHABLE_RETURN(~0);
}
#else
diff --git a/version.h b/version.h
index 9a0663c459..127db88ac4 100644
--- a/version.h
+++ b/version.h
@@ -12,7 +12,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 2
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 74
+#define RUBY_PATCHLEVEL 75
#define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 4