ruby/builtin.c
Ben Hamilton 1d5598fe0d Disable iseq-dumped builtin module for universal x86_64/arm64 binaries
During the build, Ruby has special logic to serialize its own builtin
module to disk using the binary iseq format during the build (I assume
for speed so it doesn't have to parse builtin every time it starts
up).

However, since iseq format is architecture-specific, when building on
x86_64 for universal x86_64 + arm64, the serialized builtin module is
written with the x86_64 architecture of the build machine, which fails
this check whenever ruby imports the builtin module on arm64:

1fdaa06660/compile.c (L13243)

Thankfully, there's logic to disable this feature for cross-compiled builds:

1fdaa06660/builtin.c (L6)

This disables the iseq logic for universal builds as well.

Fixes [Bug #18286]
2023-11-09 12:24:01 +09:00

70 lines
1.7 KiB
C

#include "internal.h"
#include "vm_core.h"
#include "iseq.h"
#include "builtin.h"
#if defined(CROSS_COMPILING) || defined(UNIVERSAL_BINARY)
#define INCLUDED_BY_BUILTIN_C 1
#include "mini_builtin.c"
#else
#include "builtin_binary.inc"
static const unsigned char *
bin4feature(const struct builtin_binary *bb, const char *feature, size_t *psize)
{
*psize = bb->bin_size;
return strcmp(bb->feature, feature) ? NULL : bb->bin;
}
static const unsigned char*
builtin_lookup(const char *feature, size_t *psize)
{
static int index = 0;
const unsigned char *bin = bin4feature(&builtin_binary[index++], feature, psize);
// usually, `builtin_binary` order is loading order at miniruby.
for (const struct builtin_binary *bb = &builtin_binary[0]; bb->feature &&! bin; bb++) {
bin = bin4feature(bb++, feature, psize);
}
return bin;
}
void
rb_load_with_builtin_functions(const char *feature_name, const struct rb_builtin_function *table)
{
// search binary
size_t size;
const unsigned char *bin = builtin_lookup(feature_name, &size);
if (! bin) {
rb_bug("builtin_lookup: can not find %s", feature_name);
}
// load binary
rb_vm_t *vm = GET_VM();
if (vm->builtin_function_table != NULL) rb_bug("vm->builtin_function_table should be NULL.");
vm->builtin_function_table = table;
vm->builtin_inline_index = 0;
const rb_iseq_t *iseq = rb_iseq_ibf_load_bytes((const char *)bin, size);
ASSUME(iseq); // otherwise an exception should have raised
vm->builtin_function_table = NULL;
// exec
rb_iseq_eval(rb_iseq_check(iseq));
}
#endif
void
Init_builtin(void)
{
// nothing
}
void
Init_builtin_features(void)
{
rb_load_with_builtin_functions("gem_prelude", NULL);
}