From 3cc0f9cb0fe75e28d9b0fecd242b917b6bbabc0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20H=C3=B6gberg?= <john@erlang.org>
Date: Tue, 26 Feb 2019 17:55:10 +0100
Subject: beam_validator: Disregard 'none' on join

---
 lib/compiler/src/beam_validator.erl | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib/compiler')

diff --git a/lib/compiler/src/beam_validator.erl b/lib/compiler/src/beam_validator.erl
index b70cd30a33..05920461b4 100644
--- a/lib/compiler/src/beam_validator.erl
+++ b/lib/compiler/src/beam_validator.erl
@@ -2103,6 +2103,10 @@ merge_y_regs_1(_, _, Regs) -> Regs.
 %% join(Type1, Type2) -> Type
 %%  Return the most specific type possible.
 %%  Note: Type1 must NOT be the same as Type2.
+join(none, Other) ->
+    Other;
+join(Other, none) ->
+    Other;
 join({literal,_}=T1, T2) ->
     join_literal(T1, T2);
 join(T1, {literal,_}=T2) ->
-- 
cgit v1.2.3