diff options
| author | Bill Buzbee <buzbee@android.com> | 2014-10-08 17:19:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-08 17:19:52 +0000 |
| commit | 893e855864b7535f7da92f3942d3f88aaa584dd8 (patch) | |
| tree | 9e23bad3caab07abe8e09acb6fe0f39e68c889d1 /compiler/dex | |
| parent | 663796fb14accb722e9b37c4fe8c3d2588680d7e (diff) | |
| parent | 9944b3b792103cb72df1953b5502ced9bf128305 (diff) | |
| download | art-893e855864b7535f7da92f3942d3f88aaa584dd8.zip art-893e855864b7535f7da92f3942d3f88aaa584dd8.tar.gz art-893e855864b7535f7da92f3942d3f88aaa584dd8.tar.bz2 | |
Merge "Fix to MirGraph::GetSSANameWithConst()"
Diffstat (limited to 'compiler/dex')
| -rw-r--r-- | compiler/dex/mir_graph.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/dex/mir_graph.cc b/compiler/dex/mir_graph.cc index bcbfb5a..563b64a 100644 --- a/compiler/dex/mir_graph.cc +++ b/compiler/dex/mir_graph.cc @@ -1537,7 +1537,8 @@ std::string MIRGraph::GetSSANameWithConst(int ssa_reg, bool singles_only) { return GetSSAName(ssa_reg); } if (IsConst(reg_location_[ssa_reg])) { - if (!singles_only && reg_location_[ssa_reg].wide) { + if (!singles_only && reg_location_[ssa_reg].wide && + !reg_location_[ssa_reg].high_word) { return StringPrintf("v%d_%d#0x%" PRIx64, SRegToVReg(ssa_reg), GetSSASubscript(ssa_reg), ConstantValueWide(reg_location_[ssa_reg])); } else { |