aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-05-26Merge branch 'egil/opt-compile-time/OTP-12774'Björn-Egil Dahlberg
* egil/opt-compile-time/OTP-12774: stdlib: Relax erl_anno_SUITE:is_anno/1 test Update primary bootstrap compiler: Use Maps as type information compiler: Use Maps instead of dict in beam_jump compiler: Use cerl_sets instead of gb_sets in beam_type compiler: Use Maps instead of gb_trees in beam_dead compiler: Use cerl_sets instead of gb_sets in beam_jump compiler: Use cerl_sets instead of sets in v3_kernel compiler: Use cerl_sets instead of gb_sets in sys_core_fold compiler: Add cerl_sets module compiler: Scope uses gb_sets not gb_trees beam_dict: Use Maps to map function name indices beam_dict: Use Maps to map line indices beam_dict: Use Maps to map atom indices v3_codegen: Use Maps to map local functions v3_life: Refactor variable db compiler: Use lc instead of map/1 in v3_codegen stdlib: Optimize erl_anno:is_string/1 Conflicts: bootstrap/lib/kernel/ebin/inet_dns.beam bootstrap/lib/stdlib/ebin/erl_anno.beam bootstrap/lib/stdlib/ebin/erl_lint.beam
2015-05-26Merge branch 'hans/ssh/configurable_cipher/OTP-12029'Hans
* hans/ssh/configurable_cipher/OTP-12029: ssh: Algorithms test case added ssh: Undocumented option 'compression' replaced by 'preferred_algorithms' ssh: New option 'preferred_algorithms' ssh: Remove erroneous option 'role'
2015-05-26ssh: Algorithms test case addedHans Nilsson
2015-05-26ssh: Undocumented option 'compression' replaced by 'preferred_algorithms'Hans Nilsson
The 'compression' option was used in the test cases. The new option 'preferred_algorithms' is much more powerful and can be used as a replacement.
2015-05-26ssh: New option 'preferred_algorithms'Hans Nilsson
This option enables the user to define which algorithms that are to be used as well as their precedences in the negotiation between server and client.
2015-05-26ssh: Remove erroneous option 'role'Hans Nilsson
This option is set internaly but there is no reason to set it when calling a function.
2015-05-26Merge branch 'egil/cuddle-tests'Björn-Egil Dahlberg
* egil/cuddle-tests: erts: Relax monitor_SUITE:mixer/1 erts: Refactor monitor_SUITE:mixer/1 stdlib: Minor change of unicode_SUITE stdlib: Relax iterations in binary_module_SUITE:random_ref_sr_comp/1 Remove ?line macro in binary_module_SUITE:random_ref_sr_comp/1 stdlib: Relax iterations in binary_module_SUITE:random_ref_comp/1 stdlib: Remove ?line macro in binary_module_SUITE:random_ref_comp/1 stdlib: Relax filesize of io_proto_SUITE:unicode_options_gen/1 stdlib: Relax rand_SUITE timeout debugger: Relax test map_SUITE:t_guard_receive_large/1 tools: Relax lcnt test time stdlib: ets_SUITE cuddling
2015-05-26Merge branch 'nybek/limit_leading_zeros_in_ipv6_addresses'Henrik Nord
* nybek/limit_leading_zeros_in_ipv6_addresses: Fix parsing of IPv6 addresses to limit leading zeros OTP-12773
2015-05-26Merge branch 'josevalim/jv-annotate-form'Henrik Nord
* josevalim/jv-annotate-form: Only annotate forms when linting in the compiler OTP-12772
2015-05-26Merge branch 'jlouis/cocci-noderef-fixes'Henrik Nord
* jlouis/cocci-noderef-fixes: Correct usage of sizeof() for pointer types OTP-12771
2015-05-25erts: Relax monitor_SUITE:mixer/1Björn-Egil Dahlberg
2015-05-25erts: Refactor monitor_SUITE:mixer/1Björn-Egil Dahlberg
Remove ?line macro.
2015-05-25Merge branch 'sverk/crypto/ec_key_generate/OTP-12733'Sverker Eriksson
* sverk/crypto/ec_key_generate/OTP-12733: crypto: Change eliptic curve test from 'sect113r2' to 'secp112r2'
2015-05-25stdlib: Minor change of unicode_SUITEBjörn-Egil Dahlberg
2015-05-25stdlib: Relax iterations in binary_module_SUITE:random_ref_sr_comp/1Björn-Egil Dahlberg
2015-05-25Remove ?line macro in binary_module_SUITE:random_ref_sr_comp/1Björn-Egil Dahlberg
2015-05-25stdlib: Relax iterations in binary_module_SUITE:random_ref_comp/1Björn-Egil Dahlberg
2015-05-25stdlib: Remove ?line macro in binary_module_SUITE:random_ref_comp/1Björn-Egil Dahlberg
2015-05-25stdlib: Relax filesize of io_proto_SUITE:unicode_options_gen/1Björn-Egil Dahlberg
2015-05-25stdlib: Relax rand_SUITE timeoutBjörn-Egil Dahlberg
2015-05-25debugger: Relax test map_SUITE:t_guard_receive_large/1Björn-Egil Dahlberg
Would timeout on slow machines and was unnecessary large.
2015-05-25Merge branch 'richcarl/syntax_tools/add-merl'Björn Gustavsson
* richcarl/syntax_tools/add-merl: Make merl compatible with OTP 18.0 Add tests for merl in syntax_tools Include Merl in Syntax Tools
2015-05-25Merge branch 'bjorn/asn1/doc/OTP-12765'Björn Gustavsson
* bjorn/asn1/doc/OTP-12765: asn1 doc: Alert users of limitations in test and value functions
2015-05-25Merge branch 'bjorn/kernel/code-loading'Björn Gustavsson
* bjorn/kernel/code-loading: code: Eliminate dialyzer warnings for unmatched returns
2015-05-25Merge branch 'hb/runtime_deps/OTP-12762'Hans Bolinder
* hb/runtime_deps/OTP-12762: Update runtime_dependencies in application resource files
2015-05-25Update runtime_dependencies in application resource filesHans Bolinder
Applications that use the new erl_anno module are depending on STDLIB 2.5. Note that CosNotification, Megaco, SNMP, Xmerl, and Parsetools use the erl_anno module via the Yecc parsers only (the header file in lib/parsetools/include/yeccpre.hrl calls the erl_anno module). HiPE does not call the erl_anno module, but uses an exported type. We have chosen to make HiPE dependent on the erl_anno module.
2015-05-25Merge branch 'rickard/user_drv_q_bug/OTP-12239'Rickard Green
* rickard/user_drv_q_bug/OTP-12239: Fix usage of io-request queue
2015-05-25Merge branch 'vinoski/ds-timer-wheel-fix'Rickard Green
* vinoski/ds-timer-wheel-fix: Avoid timer wheel work in dirty schedulers
2015-05-25Merge branch 'rickard/timer-improvement/OTP-12650'Rickard Green
* rickard/timer-improvement/OTP-12650: Fix bug causing timeout to overwrite exit instruction Doc fixes
2015-05-25Merge branch 'rickard/fix_alloc_stat_fix/OTP-12766'Rickard Green
* rickard/fix_alloc_stat_fix/OTP-12766: Fix statistics reported about fix alloc types
2015-05-25Fix bug causing timeout to overwrite exit instructionRickard Green
2015-05-25Doc fixesRickard Green
2015-05-25Fix statistics reported about fix alloc typesRickard Green
2015-05-22crypto: Change eliptic curve test from 'sect113r2' to 'secp112r2'Sverker Eriksson
To not fail on openssl built with #define OPENSSL_NO_EC2M (Why does the test not verify all supported curve types?)
2015-05-22asn1 doc: Alert users of limitations in test and value functionsBjörn Gustavsson
Add a note about the limitations of the asn1ct:test/1,2,3 and asn1ct:value/2 functions.
2015-05-22Merge branch 'hans/ssh/pr715/OTP-12760'Hans Nilsson
* hans/ssh/pr715/OTP-12760: Add tests for ssh rekeying Fix protocol violations during rekeying Fix rekeying according to RFC 4253
2015-05-22Make merl compatible with OTP 18.0Richard Carlsson
2015-05-22Add tests for merl in syntax_toolsRichard Carlsson
2015-05-22Include Merl in Syntax ToolsRichard Carlsson
2015-05-22Merge branch 'egil/fix-hipe_libs'Björn-Egil Dahlberg
* egil/fix-hipe_libs: stdlib: Relax maps test suite for HiPE
2015-05-22Merge branch 'richcarl/ac_tab-concurrency'Henrik Nord
* richcarl/ac_tab-concurrency: Use read_concurrency for application environment
2015-05-22Merge branch 'bk/configure-arch-ppc64le/OTP-12761'Björn-Egil Dahlberg
* bk/configure-arch-ppc64le/OTP-12761: Add architecture ppc64le architecture as a ppc64
2015-05-22Merge branch 'egil/fix-compiler-beam_bsm/OTP-12758'Björn-Egil Dahlberg
* egil/fix-compiler-beam_bsm/OTP-12758: compiler: Add tests for beam_bsm get_map_elements compiler: Teach beam_bsm get_map_elements instruction
2015-05-22code: Eliminate dialyzer warnings for unmatched returnsBjörn Gustavsson
We want to have the core applications of Erlang/OTP free from any dialyzer warnings. Eliminate the warnings for unmatched returns that were introduced in 7309ff4c3832.
2015-05-22stdlib: Relax erl_anno_SUITE:is_anno/1 testBjörn-Egil Dahlberg
Due to the relaxation of erl_anno:is_string/1, the test false = erl_anno:is_anno([{location,1},{text,[a,b,c]}]), is no longer valid.
2015-05-22Fix parsing of IPv6 addresses to limit leading zerosRory Byrne
The current implementations of inet:parse_ipv6_address/1 and inet:parse_ipv6strict_address/1 permit address strings which have an unlimited number of leading zeros. Addresses such as: "0000000000000000000000000000000ffff::" "::00000000000000000000000000000000000000000000000000000000" "::0000000f435:1" If we are using this facility to validate string representations of IPv6 addresses, then we would end up validating addresses which are non-conformant (with respect to RFC 4291 section 2.2) and potentially dangerous. This patch ensures that each segment of an IPv6 address has a maximum of 4 hex digits.
2015-05-22Update primary bootstrapBjörn Gustavsson
2015-05-22Merge branch 'bjorn/stdlib/erl_lint'Björn Gustavsson
* bjorn/stdlib/erl_lint: Remove final (?) vestiges of support for parameterized modules
2015-05-22Merge branch 'richcarl/md5-fixes'Björn Gustavsson
* richcarl/md5-fixes: code: Correct type spec for code:make_stub_module/3
2015-05-22Merge branch 'bjorn/compiler/runtime-dependencies'Björn Gustavsson
* bjorn/compiler/runtime-dependencies: Don't make 'compiler' dependent on 'tools' Update runtime depencies for the compiler application