ART: Don't nest indenters in oatdump.
Reduces the time taken by the oatdump_test by ~12s (15%)
on host and ~55s (9%) on N5.
Change-Id: I99bb16ff5f3640389815f1fe54379ca64eac071b
diff --git a/runtime/stack_map.h b/runtime/stack_map.h
index 4e42008..e8769f9 100644
--- a/runtime/stack_map.h
+++ b/runtime/stack_map.h
@@ -23,6 +23,8 @@
namespace art {
+class VariableIndentationOutputStream;
+
// Size of a frame slot, in bytes. This constant is a signed value,
// to please the compiler in arithmetic operations involving int32_t
// (signed) values.
@@ -357,7 +359,7 @@
return region_.size();
}
- void Dump(std::ostream& os, const CodeInfo& code_info);
+ void Dump(VariableIndentationOutputStream* vios, const CodeInfo& code_info);
// Special (invalid) Dex register location catalog entry index meaning
// that there is no location for a given Dex register (i.e., it is
@@ -610,7 +612,8 @@
return region_.size();
}
- void Dump(std::ostream& o, const CodeInfo& code_info, uint16_t number_of_dex_registers) const;
+ void Dump(VariableIndentationOutputStream* vios,
+ const CodeInfo& code_info, uint16_t number_of_dex_registers) const;
private:
// Return the index in the Dex register map corresponding to the Dex
@@ -837,7 +840,7 @@
&& region_.size() == other.region_.size();
}
- void Dump(std::ostream& os,
+ void Dump(VariableIndentationOutputStream* vios,
const CodeInfo& code_info,
const StackMapEncoding& encoding,
uint32_t code_offset,
@@ -931,7 +934,8 @@
return kFixedEntrySize;
}
- void Dump(std::ostream& os, const CodeInfo& info, uint16_t* number_of_dex_registers) const;
+ void Dump(VariableIndentationOutputStream* vios,
+ const CodeInfo& info, uint16_t* number_of_dex_registers) const;
private:
// TODO: Instead of plain types such as "uint8_t", introduce
@@ -1120,7 +1124,7 @@
// number of Dex virtual registers used in this method. If
// `dump_stack_maps` is true, also dump the stack maps and the
// associated Dex register maps.
- void Dump(std::ostream& os,
+ void Dump(VariableIndentationOutputStream* vios,
uint32_t code_offset,
uint16_t number_of_dex_registers,
bool dump_stack_maps) const;