tree 2947425d2d9f6133df2f22e983a78836eaa1af5d
parent 8adc8666e4210da7a4c63df9a1afa8ce70f3dcdd
author Mads Ager <ager@google.com> 1497534969 +0200
committer Mads Ager <ager@google.com> 1497534969 +0200

Move assertion to where it actually must hold.

When merging stack we can have a basic type on one path and the null
marker on the other path. In that case we take the basic type and
it is *not* true that the values are compatible. Only if none of
the stack values are null can is it guaranteed that they are
compatible.

R=sgjesse@google.com, zerny@google.com

Change-Id: I7232ee278102a0624323f744b047e626b480a38f