| commit | 241d6fdc1a5f9b921f66187cbbff7713d882f107 | |
| author | Guilherme Ottoni <ottoni@fb.com> | |
| Tue, 23 Sep 2014 01:00:58 +0000 (22 18:00 -0700) | ||
| committer | hhvm-bot <hhvm-bot@fb.com> | |
| Tue, 23 Sep 2014 01:30:27 +0000 (22 18:30 -0700) | ||
| tree | 45a3aae12eb447eae7943188f6801b3bba504396 | treesnapshot (tar.gz zip) |
| parent | b36fcb75d5f3c65dff54479ff27b84b682ca0a8b | commitdiff |
Handle multiple pass-through instructions when merging local values
Summary: FrameState::merge had logic to keep the local value if one of the
branches had a value that was the dest of a pass-through instruction
whose source came from another branch. This diff generalizes that to
handle cases where there are multiple pass-through instructions in one
of the branches.
Reviewed By: @swtaarrs
Differential Revision: D1569596
Summary: FrameState::merge had logic to keep the local value if one of the
branches had a value that was the dest of a pass-through instruction
whose source came from another branch. This diff generalizes that to
handle cases where there are multiple pass-through instructions in one
of the branches.
Reviewed By: @swtaarrs
Differential Revision: D1569596
| hphp/runtime/vm/jit/frame-state.cpp | diffblobblamehistory | |
| hphp/test/slow/control-flow/bug-5183265.php | [new file with mode: 0644] | blob |
| hphp/test/slow/control-flow/bug-5183265.php.expect | [new file with mode: 0644] | blob |
| hphp/test/slow/control-flow/bug-5183265.php.opts | [new file with mode: 0644] | blob |