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

Unified Diff: runtime/vm/object.cc

Issue 1316673005: Track which entries in the ObjectPool are native entries, and reset them when loading a precompiled… (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 3 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
Index: runtime/vm/object.cc
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
index 107ad5dffecb28d3d5767a2e978853cf94a68107..fe81d07567c572ae7581d65db4b5f7bde0fa16a9 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -11053,6 +11053,7 @@ void ObjectPool::PrintJSONImpl(JSONStream* stream, bool ref) const {
jsarr.AddValue64(imm);
break;
case ObjectPool::kExternalLabel:
+ case ObjectPool::kNativeEntry:
imm = RawValueAt(i);
jsarr.AddValueF("0x%" Px, imm);
break;
@@ -11070,15 +11071,6 @@ static const char* DescribeExternalLabel(uword addr) {
return stub_name;
}
- RuntimeFunctionId rt_id = RuntimeEntry::RuntimeFunctionIdFromAddress(addr);
- if (rt_id != kNoRuntimeFunctionId) {
- return "runtime entry";
- }
-
- if (addr == NativeEntry::LinkNativeCallLabel().address()) {
- return "link native";
- }
-
return "UNKNOWN";
}
@@ -11097,6 +11089,8 @@ void ObjectPool::DebugPrint() const {
uword addr = RawValueAt(i);
ISL_Print("0x%" Px " (external label: %s)\n",
addr, DescribeExternalLabel(addr));
+ } else if (InfoAt(i) == kNativeEntry) {
+ ISL_Print("0x%" Px " (native entry)\n", RawValueAt(i));
} else {
ISL_Print("0x%" Px " (raw)\n", RawValueAt(i));
}

Powered by Google App Engine
This is Rietveld 408576698