merge revision(s) 354d47ae5bc4edcc94db4a5391ed71a8b9844e57: [Backport #21569]

	Message not found for revision: 354d47ae5bc4edcc94db4a5391ed71a8b9844e57

2 files changed, 5 insertions, 3 deletions

diff --git a/compile.c b/compile.c
index 1ccebdecf1..0ed85a8109 100644
--- a/compile.c
+++ b/compile.c
@@ -12928,8 +12928,10 @@ ibf_dump_object_float(struct ibf_dump *dump, VALUE obj)
 static VALUE
 ibf_load_object_float(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
 {
-    const double *dblp = IBF_OBJBODY(double, offset);
-    return DBL2NUM(*dblp);
+    double d;
+    /* Avoid unaligned VFP load on ARMv7; IBF payload may be unaligned (C99 6.3.2.3 p7). */
+    memcpy(&d, IBF_OBJBODY(double, offset), sizeof(d));
+    return DBL2NUM(d);
 }
 
 static void
diff --git a/version.h b/version.h
index b9aaa6d186..82330b7e85 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 9
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 175
+#define RUBY_PATCHLEVEL 176
 
 #include "ruby/version.h"
 #include "ruby/internal/abi.h"