aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2019-02-19Merge branch 'maint'Hans Bolinder
* maint: dialyzer: Fix a bug regarding contracts
2019-02-19Merge branch 'hasse/dialyzer/fix_contract_check/OTP-15562/ERL-845' into maintHans Bolinder
* hasse/dialyzer/fix_contract_check/OTP-15562/ERL-845: dialyzer: Fix a bug regarding contracts
2019-02-19Merge branch 'john/compiler/cuddle-validator'John Högberg
* john/compiler/cuddle-validator: compiler: Allow disabling SSA passes in -compile() directives beam_validator: Infer types from result of all type test BIFs beam_validator: Infer BIF argument types beam_validator: type_test in BIFs that only fail on invalid types beam_validator: Simplify complex branches beam_validator: Explain why verify_get_map wipes dst registers beam_validator: fconv means we have a number beam_validator: Simplify update_ne/eq_types beam_validator: Remove pointless fragility propagation beam_validator: Misc cosmetic refactoring
2019-02-18Merge branch 'maint'Lukas Larsson
2019-02-18erts: Remove etp macro offsetofLukas Larsson
The macro command was added quite recently and far from all of our testmachines have this command
2019-02-18Merge branch 'maint'Lukas Larsson
2019-02-18Merge branch 'lukas/erts/fix-exit_status-netbsd/OTP-15558' into maintLukas Larsson
* lukas/erts/fix-exit_status-netbsd/OTP-15558: Fix EV_DISPATCH detection on NetBSD
2019-02-18Merge branch 'ingela/ssl/dialyzer'Ingela Anderton Andin
* ingela/ssl/dialyzer: ssl: Correct merge commit thanks to dialyzer
2019-02-18ssl: Correct merge commit thanks to dialyzerIngela Anderton Andin
Also make a weaker spec in ssl_internal.hrl for now as it creates a conflict between error handling and dialyzer warnings.
2019-02-18compiler: Allow disabling SSA passes in -compile() directivesJohn Högberg
This fixes compiling against older OTP versions with the +r?VSN options, which often expand to disabling certain SSA passes to avoid new instructions.
2019-02-18Merge branch 'ingela/ssl-shrink-state-merge'Ingela Anderton Andin
2019-02-18Merge branch 'ingela/ssl/shrink-state' into maintIngela Anderton Andin
* ingela/ssl/shrink-state: ssl: Remove duplicate record_cb handling ssl: Add test case for continued handshake with a timeout ssl: Use gen_statem named timers to handle connection and recv timeouts ssl: Move and rename diffie_hellman_keys and srp_keys to kex_keys ssl: Move key_algorithm to handshake_env ssl: srp ssl: Rename ssl: Move diffie_hellman_params to handshake_env ssl: Move and rename psk_identity state record field ssl: Move premaster_secret to handshake_env ssl: Make flight_state DTLS specific ssl: Add private_key to connection_env ssl: Remove unused record field ssl: Add erl_dist_handle to connection_env ssl: Add negotiated_version to connection_env ssl: Add key exchange items to handshake_env ssl: Add hashsign_algorithm and cert_hashsign_algorithm to handshake_env ssl: Add downgrade handling to connection_env ssl: Create connection_env ssl: Handle renegotiation and extensions in handshake_env
2019-02-18ssl: Workaround for compiler errors, to be reverted laterIngela Anderton Andin
2019-02-18Merge branch 'maint'Ingela Anderton Andin
Conflicts: lib/ssl/src/dtls_connection.erl lib/ssl/src/ssl_connection.erl lib/ssl/src/ssl_connection.hrl lib/ssl/src/tls_connection.erl
2019-02-18Merge branch 'maint'Raimo Niskanen
* maint: Updated OTP version Prepare release
2019-02-18Merge branch 'maint-21' into maintRaimo Niskanen
* maint-21: Updated OTP version Prepare release
2019-02-18Merge pull request #2102 from dszoboszlay/optimise-ext-table-dumping-furtherDan Gudmundsson
Optimise ext table dumping OTP-15588
2019-02-18Merge branch 'maint'Dan Gudmundsson
* maint: Fix showModal crash on Mojave Add wxGCDC wx: Add wxDisplay wx: Change wxFONTWEIGHT enums Let wxwidgets check events
2019-02-18Merge branch 'dgud/wx/extend-functionality/OTP-15587' into maintDan Gudmundsson
* dgud/wx/extend-functionality/OTP-15587: Fix showModal crash on Mojave Add wxGCDC wx: Add wxDisplay wx: Change wxFONTWEIGHT enums Let wxwidgets check events
2019-02-18Merge branch 'maint'Siri Hansen
* maint: Updated OTP version Prepare release
2019-02-18Merge branch 'bjorn/compiler/cuddle-with-tests'Björn Gustavsson
* bjorn/compiler/cuddle-with-tests: inline_SUITE: Make coverage/1 test cheaper Remove compile_SUITE:big_file/1 Add test modules that disable all SSA optimizations Cover erl_bifs.erl Remove attempt to handle all bs_match_string instructions Cover exception throwing code in beam_ssa_opt Parallelize test of listing files Don't limit the number of processes when running cover
2019-02-18Merge tag 'OTP-20.3.2.1' into maintSiri Hansen
=== OTP-20.3.2.1 === Changed Applications: - common_test-1.15.4.0.1 Unchanged Applications: - asn1-5.0.5 - compiler-7.1.5 - cosEvent-2.2.2 - cosEventDomain-1.2.2 - cosFileTransfer-1.2.2 - cosNotification-1.2.3 - cosProperty-1.2.3 - cosTime-1.2.3 - cosTransactions-1.3.3 - crypto-4.2.1 - debugger-4.2.4 - dialyzer-3.2.4 - diameter-2.1.4 - edoc-0.9.2 - eldap-1.2.3 - erl_docgen-0.7.2 - erl_interface-3.10.1 - erts-9.3 - et-1.6.1 - eunit-2.3.5 - hipe-3.17.1 - ic-4.4.3 - inets-6.5 - jinterface-1.8.1 - kernel-5.4.3 - megaco-3.18.3 - mnesia-4.15.3 - observer-2.7 - odbc-2.12.1 - orber-3.8.4 - os_mon-2.4.4 - otp_mibs-1.1.2 - parsetools-2.1.6 - public_key-1.5.2 - reltool-0.7.5 - runtime_tools-1.12.5 - sasl-3.1.1 - snmp-5.2.10 - ssh-4.6.7 - ssl-8.2.5 - stdlib-3.4.5 - syntax_tools-2.1.4 - tools-2.11.2 - wx-1.8.3 - xmerl-1.3.16 * tag 'OTP-20.3.2.1': Updated OTP version Prepare release
2019-02-18Merge branch 'maint'Dan Gudmundsson
* maint: Add OBSERVER_SCALE environment variable for HiDPI support
2019-02-18Merge branch 'pr/2105' into maintDan Gudmundsson
* pr/2105: Add OBSERVER_SCALE environment variable for HiDPI support OTP-15586
2019-02-18Add OBSERVER_SCALE environment variable for HiDPI supportLoïc Hoguin
2019-02-18Updated OTP versionOTP-20.3.2.1Siri Hansen
2019-02-18Prepare releaseSiri Hansen
2019-02-18Merge branch 'siri/ct/post_end_per_testcase-change-status/ERIERL-282/OTP-15584'Siri Hansen
* siri/ct/post_end_per_testcase-change-status/ERIERL-282/OTP-15584: [ct] Allow post_end_per_testcase hook to change tc status after timetrap
2019-02-18beam_validator: Infer types from result of all type test BIFsJohn Högberg
The compiler will usually optimize these into test instructions, but they'll nevertheless pop up in some cases.
2019-02-18beam_validator: Infer BIF argument typesJohn Högberg
If we know that a BIF will badarg unless its arguments have certain types, we can infer that we have at least those types on success. Note that we can't do this in the general case as the BIF could fail for reasons other than bad arguments.
2019-02-18Merge branch 'ingela/ssl/shrink-state' into maintIngela Anderton Andin
* ingela/ssl/shrink-state: ssl: Remove duplicate record_cb handling ssl: Add test case for continued handshake with a timeout ssl: Use gen_statem named timers to handle connection and recv timeouts ssl: Move and rename diffie_hellman_keys and srp_keys to kex_keys ssl: Move key_algorithm to handshake_env ssl: srp ssl: Rename ssl: Move diffie_hellman_params to handshake_env ssl: Move and rename psk_identity state record field ssl: Move premaster_secret to handshake_env ssl: Make flight_state DTLS specific ssl: Add private_key to connection_env ssl: Remove unused record field ssl: Add erl_dist_handle to connection_env ssl: Add negotiated_version to connection_env ssl: Add key exchange items to handshake_env ssl: Add hashsign_algorithm and cert_hashsign_algorithm to handshake_env ssl: Add downgrade handling to connection_env ssl: Create connection_env ssl: Handle renegotiation and extensions in handshake_env
2019-02-18Merge branch 'maint'Hans Nilsson
* maint: crypto: Fix of engine_SUITE:engine_list test case
2019-02-18Merge branch 'hans/crypto/cuddle_tests' into maintHans Nilsson
* hans/crypto/cuddle_tests: crypto: Fix of engine_SUITE:engine_list test case
2019-02-18crypto: Fix of engine_SUITE:engine_list test caseHans Nilsson
2019-02-18Merge branch 'maint'Hans Bolinder
* maint: Update primary bootstrap stdlib: Optimize formatted printing of terms Conflicts: bootstrap/lib/stdlib/ebin/io_lib.beam bootstrap/lib/stdlib/ebin/io_lib_format.beam bootstrap/lib/stdlib/ebin/io_lib_pretty.beam
2019-02-18Merge branch 'hasse/stdlib/optimize_pretty_print/ERIERL-306/OTP-15573' into ↵Hans Bolinder
maint * hasse/stdlib/optimize_pretty_print/ERIERL-306/OTP-15573: Update primary bootstrap stdlib: Optimize formatted printing of terms
2019-02-15Merge branch 'maint'Sverker Eriksson
2019-02-15Merge PR-2139 from sverker/ets-doc-partially-bound-key/OTP-15545Sverker Eriksson
Add ETS docs about partially bound key traversal
2019-02-15Merge branch 'maint'Siri Hansen
* maint: Updated OTP version Prepare release
2019-02-15Merge branch 'maint-20' into maintSiri Hansen
* maint-20: Updated OTP version Prepare release
2019-02-15Updated OTP versionOTP-20.3.8.20Erlang/OTP
2019-02-15Prepare releaseErlang/OTP
2019-02-15Merge branch ↵Erlang/OTP
'siri/ct/post_end_per_testcase-change-status/ERIERL-282/OTP-15584' into maint-20 * siri/ct/post_end_per_testcase-change-status/ERIERL-282/OTP-15584: [ct] Allow post_end_per_testcase hook to change tc status after timetrap
2019-02-15Updated OTP versionOTP-21.2.6Erlang/OTP
2019-02-15Prepare releaseErlang/OTP
2019-02-15Merge branch 'hasse/stdlib/optimize_pretty_print/ERIERL-306/OTP-15573' into ↵Erlang/OTP
maint-21 * hasse/stdlib/optimize_pretty_print/ERIERL-306/OTP-15573: Update primary bootstrap stdlib: Optimize formatted printing of terms
2019-02-15Merge branch 'raimo/erts/gen_tcp-listen-linger-slow/ERIERL-303/OTP-14728' ↵Erlang/OTP
into maint-21 * raimo/erts/gen_tcp-listen-linger-slow/ERIERL-303/OTP-14728: Check empty_out_q at close also for linger
2019-02-15Update primary bootstrapHans Bolinder
2019-02-15Merge branch 'maint'Siri Hansen
2019-02-15Merge branch ↵Siri Hansen
'siri/ct/post_end_per_testcase-change-status/ERIERL-282/OTP-15584' into maint * siri/ct/post_end_per_testcase-change-status/ERIERL-282/OTP-15584: [ct] Allow post_end_per_testcase hook to change tc status after timetrap