From 9944b3b792103cb72df1953b5502ced9bf128305 Mon Sep 17 00:00:00 2001 From: Mark Mendell Date: Mon, 6 Oct 2014 10:58:54 -0400 Subject: [PATCH] Fix to MirGraph::GetSSANameWithConst() Don't call ConstantValueWide() for a wide constant if high_word is set, as it will DCHECK if you try to get the value for the high word. Change-Id: I046ee3e6833ceb556a3c2dbc95699882d30d65f9 Signed-off-by: Mark Mendell --- compiler/dex/mir_graph.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/dex/mir_graph.cc b/compiler/dex/mir_graph.cc index bcbfb5abc..563b64a33 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 { -- 2.11.0