diff options
| author | Björn Gustavsson <[email protected]> | 2017-11-13 12:58:04 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2017-11-13 13:11:37 +0100 |
| commit | 8059d34e52587880b0bbb6eb2845e6a46cb19d21 (patch) | |
| tree | c14b5cb1cdf470ac073143d09ace2250a88ec9d4 /lib/compiler/src | |
| parent | 743e5a4d6b71317672e2527b0ab77ec45d91aac9 (diff) | |
| parent | cde4ddc0494c9cdc8169dbc552e0e9b91c3a1b30 (diff) | |
| download | otp-8059d34e52587880b0bbb6eb2845e6a46cb19d21.tar.gz otp-8059d34e52587880b0bbb6eb2845e6a46cb19d21.tar.bz2 otp-8059d34e52587880b0bbb6eb2845e6a46cb19d21.zip | |
Merge branch 'maint'
* maint:
Recognize 'deterministic' when given in a -compile() attribute
Conflicts:
lib/compiler/src/beam_asm.erl
Diffstat (limited to 'lib/compiler/src')
| -rw-r--r-- | lib/compiler/src/compile.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl index bc519264fc..b0d0da0f66 100644 --- a/lib/compiler/src/compile.erl +++ b/lib/compiler/src/compile.erl @@ -1448,16 +1448,16 @@ beam_asm(Code0, #compile{ifile=File,extra_chunks=ExtraChunks,options=CompilerOpt {ok,DebugInfo,Opts0} -> Opts1 = [O || O <- Opts0, effects_code_generation(O)], Chunks = [{<<"Dbgi">>, DebugInfo} | ExtraChunks], - CompileInfo = compile_info(File, Opts1), + CompileInfo = compile_info(File, CompilerOpts, Opts1), {ok,Code} = beam_asm:module(Code0, Chunks, CompileInfo, CompilerOpts), {ok,Code,St#compile{abstract_code=[]}}; {error,Es} -> {error,St#compile{errors=St#compile.errors ++ [{File,Es}]}} end. -compile_info(File, Opts) -> - IsSlim = member(slim, Opts), - IsDeterministic = member(deterministic, Opts), +compile_info(File, CompilerOpts, Opts) -> + IsSlim = member(slim, CompilerOpts), + IsDeterministic = member(deterministic, CompilerOpts), Info0 = proplists:get_value(compile_info, Opts, []), Info1 = case paranoid_absname(File) of |