Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1283)

Unified Diff: runtime/vm/object.cc

Issue 265853003: $-indexed printf params don't work on all of our architectures, turns out. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | runtime/vm/parser_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/object.cc
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
index dd1257d1791104be1b44737192dad20e54a7f965..6311d13349c211cf7de49e87b14191f21382b2db 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -10268,32 +10268,35 @@ static const char* VarKindString(int kind) {
}
-const char* LocalVarDescriptors::ToCString() const {
- intptr_t len = 1; // Trailing '\0'.
- const char* kFormat =
- "%2" Pd " %-13s scope=%-3d index=%-3" Pd ""
- " begin=%-3" Pd " end=%-3" Pd " name=%s\n";
- const char* kFormatCtxLevel =
- "%1$2" Pd " %2$-13s level=%4$-3" Pd " scope=%3$-3d"
- " begin=%5$-3" Pd " end=%6$" Pd "\n";
- const char* kFormatCtxVar =
- "%2" Pd " %-13s level=%-3d index=%-3" Pd ""
- " begin=%-3" Pd " end=%-3" Pd " name=%s\n";
- for (intptr_t i = 0; i < Length(); i++) {
- String& var_name = String::Handle(GetName(i));
- if (var_name.IsNull()) {
- var_name = Symbols::Empty().raw();
- }
- RawLocalVarDescriptors::VarInfo info;
- GetInfo(i, &info);
- const char* format = kFormat;
- if (info.kind == RawLocalVarDescriptors::kContextLevel) {
- format = kFormatCtxLevel;
- } else if (info.kind == RawLocalVarDescriptors::kContextVar) {
- format = kFormatCtxVar;
- }
- len += OS::SNPrint(NULL, 0,
- format,
+static int PrintVarInfo(char* buffer, int len,
+ intptr_t i,
+ const String& var_name,
+ const RawLocalVarDescriptors::VarInfo& info) {
+ if (info.kind == RawLocalVarDescriptors::kContextLevel) {
+ return OS::SNPrint(buffer, len,
+ "%2" Pd " %-13s level=%-3" Pd " scope=%-3d"
+ " begin=%-3" Pd " end=%" Pd "\n",
+ i,
+ VarKindString(info.kind),
+ info.index,
+ info.scope_id,
+ info.begin_pos,
+ info.end_pos);
+ } else if (info.kind == RawLocalVarDescriptors::kContextVar) {
+ return OS::SNPrint(buffer, len,
+ "%2" Pd " %-13s level=%-3d index=%-3" Pd ""
+ " begin=%-3" Pd " end=%-3" Pd " name=%s\n",
+ i,
+ VarKindString(info.kind),
+ info.scope_id,
+ info.index,
+ info.begin_pos,
+ info.end_pos,
+ var_name.ToCString());
+ } else {
+ return OS::SNPrint(buffer, len,
+ "%2" Pd " %-13s scope=%-3d index=%-3" Pd ""
+ " begin=%-3" Pd " end=%-3" Pd " name=%s\n",
i,
VarKindString(info.kind),
info.scope_id,
@@ -10302,31 +10305,33 @@ const char* LocalVarDescriptors::ToCString() const {
info.end_pos,
var_name.ToCString());
}
+}
+
+
+const char* LocalVarDescriptors::ToCString() const {
+ intptr_t len = 1; // Trailing '\0'.
+ String& var_name = String::Handle();
+ for (intptr_t i = 0; i < Length(); i++) {
+ RawLocalVarDescriptors::VarInfo info;
+ var_name = GetName(i);
+ if (var_name.IsNull()) {
+ var_name = Symbols::Empty().raw();
+ }
+ GetInfo(i, &info);
+ len += PrintVarInfo(NULL, 0, i, var_name, info);
+ }
char* buffer = Isolate::Current()->current_zone()->Alloc<char>(len);
intptr_t num_chars = 0;
for (intptr_t i = 0; i < Length(); i++) {
- String& var_name = String::Handle(GetName(i));
+ RawLocalVarDescriptors::VarInfo info;
+ var_name = GetName(i);
if (var_name.IsNull()) {
var_name = Symbols::Empty().raw();
}
- RawLocalVarDescriptors::VarInfo info;
GetInfo(i, &info);
- const char* format = kFormat;
- if (info.kind == RawLocalVarDescriptors::kContextLevel) {
- format = kFormatCtxLevel;
- } else if (info.kind == RawLocalVarDescriptors::kContextVar) {
- format = kFormatCtxVar;
- }
- num_chars += OS::SNPrint((buffer + num_chars),
- (len - num_chars),
- format,
- i,
- VarKindString(info.kind),
- info.scope_id,
- info.index,
- info.begin_pos,
- info.end_pos,
- var_name.ToCString());
+ num_chars += PrintVarInfo((buffer + num_chars),
+ (len - num_chars),
+ i, var_name, info);
}
return buffer;
}
« no previous file with comments | « no previous file | runtime/vm/parser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698