diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2011-05-13 14:40:56 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2011-05-13 14:40:56 +0200 |
| commit | fa60837d0bcf2d3be4a0cda411a4f2a9f3b682b3 (patch) | |
| tree | d50108df0517be37b23dd504fcb570cf000c5295 /erts/emulator/beam | |
| parent | 0c73cf3d305c4b033c6e1efa6ebd08796a1d8682 (diff) | |
| parent | e240140365fe61f747d788cd4f96f618f76cc63d (diff) | |
| download | otp-fa60837d0bcf2d3be4a0cda411a4f2a9f3b682b3.tar.gz otp-fa60837d0bcf2d3be4a0cda411a4f2a9f3b682b3.tar.bz2 otp-fa60837d0bcf2d3be4a0cda411a4f2a9f3b682b3.zip | |
Merge branch 'sverker/hipe-misc-fixing/OTP-9298' into dev
* sverker/hipe-misc-fixing/OTP-9298:
hipe_mkliterals print argv[0] in generated files
Fix code:is_module_native segv on deleted module
lock checking fix in hipe_bif2.c
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/beam_bif_load.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/beam_bif_load.c b/erts/emulator/beam/beam_bif_load.c index 1dbf6f9b92..d76a7d8e9f 100644 --- a/erts/emulator/beam/beam_bif_load.c +++ b/erts/emulator/beam/beam_bif_load.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1999-2010. All Rights Reserved. + * Copyright Ericsson AB 1999-2011. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in @@ -142,7 +142,7 @@ BIF_RETTYPE code_is_module_native_1(BIF_ALIST_1) if ((modp = erts_get_module(BIF_ARG_1)) == NULL) { return am_undefined; } - return (is_native(modp->code) || + return ((modp->code && is_native(modp->code)) || (modp->old_code != 0 && is_native(modp->old_code))) ? am_true : am_false; } |