diff options
author | Björn Gustavsson <[email protected]> | 2013-12-18 10:08:37 +0100 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2013-12-18 10:08:37 +0100 |
commit | 39de9391f76ed8f3503869684726d18d0fe723c3 (patch) | |
tree | 3475105fc750a023be6a879070ed13705c98bd40 /lib/compiler/test/compile_SUITE.erl | |
parent | 165846b143c8275350972caaf4c1013cfe5db043 (diff) | |
parent | 20c38f0156b711032274cdea5a5049fc7ce8e81f (diff) | |
download | otp-39de9391f76ed8f3503869684726d18d0fe723c3.tar.gz otp-39de9391f76ed8f3503869684726d18d0fe723c3.tar.bz2 otp-39de9391f76ed8f3503869684726d18d0fe723c3.zip |
Merge branch 'nox/asm-reentrant/OTP-11544'
* nox/asm-reentrant/OTP-11544:
Test compilation of BEAM assembly with optimisations on
Keep exit blocks in order when moving them in beam_jump
Add missing recv_set, recv_mark and '%' to BEAM live annotation
Collect all optimised allocate instructions in beam_block
Properly collect allocate_zero instructions in beam_block
Properly let floating-point instructions through in the BEAM compiler
Diffstat (limited to 'lib/compiler/test/compile_SUITE.erl')
-rw-r--r-- | lib/compiler/test/compile_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl index 66ce6c00ab..1dc1ddb653 100644 --- a/lib/compiler/test/compile_SUITE.erl +++ b/lib/compiler/test/compile_SUITE.erl @@ -794,7 +794,7 @@ do_asm(Beam, Outdir) -> {ok,Fd} = file:open(AsmFile, [write,{encoding,utf8}]), beam_listing:module(Fd, Asm), ok = file:close(Fd), - case compile:file(AsmFile, [from_asm,no_postopt,binary,report]) of + case compile:file(AsmFile, [from_asm,binary,report]) of {ok,M,_} -> ok = file:delete(AsmFile); Other -> |