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

k0kubun · k0kubun · commit 22c2262b8322 · 2025-09-29T14:36:06.000-07:00
IBF: Avoid unaligned load on 32 bit platforms

	[Bug #21569]
diff --git a/compile.c b/compile.c
@@ -13909,8 +13909,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
@@ -11,7 +11,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 56
+#define RUBY_PATCHLEVEL 57
 
 #include "ruby/version.h"
 #include "ruby/internal/abi.h"

Original file line number	Diff line number	Diff line change
`@@ -13909,8 +13909,10 @@ ibf_dump_object_float(struct ibf_dump *dump, VALUE obj)`
`13909`	`13909`	`static VALUE`
`13910`	`13910`	`ibf_load_object_float(const struct ibf_load load, const struct ibf_object_header header, ibf_offset_t offset)`
`13911`	`13911`	`{`
`13912`		`- const double *dblp = IBF_OBJBODY(double, offset);`
`13913`		`- return DBL2NUM(*dblp);`
	`13912`	`+ double d;`
	`13913`	`+ /* Avoid unaligned VFP load on ARMv7; IBF payload may be unaligned (C99 6.3.2.3 p7). */`
	`13914`	`+ memcpy(&d, IBF_OBJBODY(double, offset), sizeof(d));`
	`13915`	`+ return DBL2NUM(d);`
`13914`	`13916`	`}`
`13915`	`13917`
`13916`	`13918`	`static void`