aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2017-08-25 13:13:20 +0200
committerHenrik Nord <[email protected]>2017-08-25 13:13:20 +0200
commit3bc5c3b35b3151143dffe94290c9ddf29b1b10d6 (patch)
tree74c0402d867c894fe829649062e10f6cf5ba08fa /lib
parent55acf245c53b1a4b36ea4514bdc93b3acba699a1 (diff)
parenta230f26086b3db9097f06d4bb91fb3b2e9379c77 (diff)
downloadotp-3bc5c3b35b3151143dffe94290c9ddf29b1b10d6.tar.gz
otp-3bc5c3b35b3151143dffe94290c9ddf29b1b10d6.tar.bz2
otp-3bc5c3b35b3151143dffe94290c9ddf29b1b10d6.zip
Merge branch 'maint-20' into maint
* maint-20: Updated OTP version Prepare release dialyzer: Fix a bug where merging PLT:s could lose info
Diffstat (limited to 'lib')
-rw-r--r--lib/dialyzer/doc/src/notes.xml15
-rw-r--r--lib/dialyzer/src/dialyzer_plt.erl1
-rw-r--r--lib/dialyzer/vsn.mk2
3 files changed, 17 insertions, 1 deletions
diff --git a/lib/dialyzer/doc/src/notes.xml b/lib/dialyzer/doc/src/notes.xml
index 0d2cb6c4df..c26b7aab5e 100644
--- a/lib/dialyzer/doc/src/notes.xml
+++ b/lib/dialyzer/doc/src/notes.xml
@@ -32,6 +32,21 @@
<p>This document describes the changes made to the Dialyzer
application.</p>
+<section><title>Dialyzer 3.2.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p> Fix a bug where merging PLT:s could lose info. The
+ bug was introduced in Erlang/OTP 20.0. </p>
+ <p>
+ Own Id: OTP-14558 Aux Id: ERIERL-53 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Dialyzer 3.2</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/dialyzer/src/dialyzer_plt.erl b/lib/dialyzer/src/dialyzer_plt.erl
index 47994fc35b..0fd99bbc04 100644
--- a/lib/dialyzer/src/dialyzer_plt.erl
+++ b/lib/dialyzer/src/dialyzer_plt.erl
@@ -772,6 +772,7 @@ tab_is_disj(K1, T1, T2) ->
end.
merge_tables(T1, T2) ->
+ ets:safe_fixtable(T1, true),
tab_merge(ets:first(T1), T1, T2).
tab_merge('$end_of_table', T1, T2) ->
diff --git a/lib/dialyzer/vsn.mk b/lib/dialyzer/vsn.mk
index 4a1a7c25a0..866a82ee3e 100644
--- a/lib/dialyzer/vsn.mk
+++ b/lib/dialyzer/vsn.mk
@@ -1 +1 @@
-DIALYZER_VSN = 3.2
+DIALYZER_VSN = 3.2.1