diff options
| author | Ian Rogers <irogers@google.com> | 2014-01-24 21:51:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-24 21:51:00 +0000 |
| commit | 787bbf8d181284afb564dd36fea8a6453337b888 (patch) | |
| tree | b1286c0872da59121532e707d7def2627110d84b | |
| parent | e4a8d914d4e6a2fc8015609a91cf2f6e5ea7d2ec (diff) | |
| parent | 23b03b5b5fdaa517eda3b8b358752672cf6046b1 (diff) | |
| download | android_art-787bbf8d181284afb564dd36fea8a6453337b888.tar.gz android_art-787bbf8d181284afb564dd36fea8a6453337b888.tar.bz2 android_art-787bbf8d181284afb564dd36fea8a6453337b888.zip | |
Merge "64bit printf flag clean-up for MIR graph."
| -rw-r--r-- | compiler/dex/mir_graph.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/dex/mir_graph.cc b/compiler/dex/mir_graph.cc index 8d1653fc6c..f321cdaf4d 100644 --- a/compiler/dex/mir_graph.cc +++ b/compiler/dex/mir_graph.cc @@ -973,7 +973,7 @@ char* MIRGraph::GetDalvikDisassembly(const MIR* mir) { str.append(StringPrintf(", #%d", insn.vB)); break; case Instruction::k51l: // Add one wide immediate - str.append(StringPrintf(", #%lld", insn.vB_wide)); + str.append(StringPrintf(", #%" PRId64, insn.vB_wide)); break; case Instruction::k21c: // One register, one string/type/method index case Instruction::k31c: @@ -1026,7 +1026,7 @@ std::string MIRGraph::GetSSANameWithConst(int ssa_reg, bool singles_only) { } if (IsConst(reg_location_[ssa_reg])) { if (!singles_only && reg_location_[ssa_reg].wide) { - return StringPrintf("v%d_%d#0x%llx", SRegToVReg(ssa_reg), GetSSASubscript(ssa_reg), + return StringPrintf("v%d_%d#0x%" PRIx64, SRegToVReg(ssa_reg), GetSSASubscript(ssa_reg), ConstantValueWide(reg_location_[ssa_reg])); } else { return StringPrintf("v%d_%d#0x%x", SRegToVReg(ssa_reg), GetSSASubscript(ssa_reg), |