aboutsummaryrefslogtreecommitdiffstats
path: root/lib/dialyzer/src
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/dialyzer/src
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/dialyzer/src')
-rw-r--r--lib/dialyzer/src/dialyzer_plt.erl1
1 files changed, 1 insertions, 0 deletions
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) ->