diff options
| author | Sverker Eriksson <[email protected]> | 2016-11-02 14:39:15 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-11-02 14:39:15 +0100 |
| commit | 38e1f98a0a4729357c3669a5c5e2f93ad5ab1d90 (patch) | |
| tree | 4acc9c4347b18577cdfbb4721d10a636846a79b9 /erts/emulator/beam | |
| parent | 2ccd860e57929c12752d55226d4c4084bccc5b2d (diff) | |
| parent | 24485c421f15b00d0b5c97633d701373b53897a5 (diff) | |
| download | otp-38e1f98a0a4729357c3669a5c5e2f93ad5ab1d90.tar.gz otp-38e1f98a0a4729357c3669a5c5e2f93ad5ab1d90.tar.bz2 otp-38e1f98a0a4729357c3669a5c5e2f93ad5ab1d90.zip | |
Merge branch 'sverker/hipe-load_nif-error/OTP-14002'
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_nif.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c index c5606f72a1..9872a3ab81 100644 --- a/erts/emulator/beam/erl_nif.c +++ b/erts/emulator/beam/erl_nif.c @@ -3166,6 +3166,12 @@ BIF_RETTYPE load_nif_2(BIF_ALIST_2) struct erl_module_instance* this_mi; struct erl_module_instance* prev_mi; + if (BIF_P->flags & F_HIPE_MODE) { + ret = load_nif_error(BIF_P, "notsup", "Calling load_nif from HiPE compiled " + "modules not supported"); + BIF_RET(ret); + } + encoding = erts_get_native_filename_encoding(); if (encoding == ERL_FILENAME_WIN_WCHAR) { /* Do not convert the lib name to utf-16le yet, do that in win32 specific code */ |