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

Unified Diff: runtime/vm/object.cc

Issue 1295693002: Add ObjectPool tag for external labels. Use LoadExternalLabel for native calls... (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 4 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 | « runtime/vm/object.h ('k') | no next file » | 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 c0b9241577e3d24ef7342da39158bf3b0c12fdb3..95315c421cb3bc5185e2875a79e2061c1d8200dc 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -10964,11 +10964,13 @@ void ObjectPool::PrintJSONImpl(JSONStream* stream, bool ref) const {
jsarr.AddValue(obj);
break;
case ObjectPool::kImmediate:
- // We might want to distingiush between immediates and addresses
- // in the future.
imm = RawValueAt(i);
jsarr.AddValue64(imm);
break;
+ case ObjectPool::kExternalLabel:
+ imm = RawValueAt(i);
+ jsarr.AddValueF("0x%" Px, imm);
+ break;
default:
UNREACHABLE();
}
@@ -10984,6 +10986,8 @@ void ObjectPool::DebugPrint() const {
ISL_Print(" %" Pd ": 0x%" Px " %s (obj)\n", i,
reinterpret_cast<uword>(ObjectAt(i)),
Object::Handle(ObjectAt(i)).ToCString());
+ } else if (InfoAt(i) == kExternalLabel) {
+ ISL_Print(" %" Pd ": 0x%" Px " (external label)\n", i, RawValueAt(i));
} else {
ISL_Print(" %" Pd ": 0x%" Px " (raw)\n", i, RawValueAt(i));
}
« no previous file with comments | « runtime/vm/object.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698