diff options
author | Mike Barnett <mbarnett@microsoft.com> | 2012-01-26 16:32:25 -0800 |
---|---|---|
committer | Mike Barnett <mbarnett@microsoft.com> | 2012-01-26 16:32:25 -0800 |
commit | be438c723caf64dd093f79eab25b3b1f5fa5a609 (patch) | |
tree | bc70f0b5943a2af0af3cb74b078bb3386c559623 /BCT/BytecodeTranslator/Program.cs | |
parent | 80fbe74f7cc472c733a85a90f774182d0d0a8964 (diff) | |
parent | 405111b0552e4303a0179c1ab36b091e694ba6a5 (diff) |
Automated merge with https://hg01.codeplex.com/boogie
Diffstat (limited to 'BCT/BytecodeTranslator/Program.cs')
-rw-r--r-- | BCT/BytecodeTranslator/Program.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/BCT/BytecodeTranslator/Program.cs b/BCT/BytecodeTranslator/Program.cs index 5217df14..abbdcc00 100644 --- a/BCT/BytecodeTranslator/Program.cs +++ b/BCT/BytecodeTranslator/Program.cs @@ -565,10 +565,10 @@ namespace BytecodeTranslator { Bpl.Expr rexpr = Bpl.Expr.Ident(rvar);
if (rtype == ltype) {
// do nothing
- } else if (ltype == sink.Heap.BoxType) {
+ } else if (ltype == sink.Heap.UnionType) {
rexpr = sink.Heap.Box(Bpl.Token.NoToken, rtype, rexpr);
}
- else if (rtype == sink.Heap.BoxType) {
+ else if (rtype == sink.Heap.UnionType) {
rexpr = sink.Heap.Unbox(Bpl.Token.NoToken, ltype, rexpr);
}
else {
|