Always use the same json for null in the vm service.

runtime/vm/object.cc

Index: runtime/vm/object.cc
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
index a2402f6843367522845a37f747b051a1c009e528..cc07afd9753e61df95a151fe6e1ee01481293701 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -1486,6 +1486,18 @@ void Object::Print() const {
 }
 
 
+void Object::PrintJSON(JSONStream* stream, bool ref) const {
+  if (IsNull()) {
+    JSONObject jsobj(stream);
+    jsobj.AddProperty("type", ref ? "@Null" : "Null");
+    jsobj.AddProperty("id", "objects/null");
+    jsobj.AddProperty("valueAsString", "null");
+  } else {
+    PrintJSONImpl(stream, ref);
+  }
+}
+
+
 RawString* Object::DictionaryName() const {
   return String::null();
 }
@@ -3889,7 +3901,7 @@ const char* Class::ToCString() const {
 }
 
 
-void Class::PrintToJSONStream(JSONStream* stream, bool ref) const {
+void Class::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   if ((raw() == Class::null()) || (id() == kFreeListElement)) {
     jsobj.AddProperty("type", "Null");
@@ -4070,8 +4082,8 @@ const char* UnresolvedClass::ToCString() const {
 }
 
 
-void UnresolvedClass::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Object::PrintToJSONStream(stream, ref);
+void UnresolvedClass::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Object::PrintJSONImpl(stream, ref);
 }
 
 
@@ -4225,13 +4237,8 @@ bool TypeArguments::TypeTest(TypeTestKind test_kind,
 }
 
 
-void TypeArguments::PrintToJSONStream(JSONStream* stream, bool ref) const {
+void TypeArguments::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
-  if (IsNull()) {
-    jsobj.AddProperty("type", ref ? "@Null" : "Null");
-    jsobj.AddProperty("id", "objects/null");
-    return;
-  }
   // The index in the canonical_type_arguments table cannot be used as part of
   // the object id (as in typearguments/id), because the indices are not
   // preserved when the table grows and the entries get rehashed. Use the ring.
@@ -4825,8 +4832,8 @@ const char* PatchClass::ToCString() const {
 }
 
 
-void PatchClass::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Object::PrintToJSONStream(stream, ref);
+void PatchClass::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Object::PrintJSONImpl(stream, ref);
 }
 
 
@@ -6426,7 +6433,7 @@ const char* Function::ToCString() const {
 }
 
 
-void Function::PrintToJSONStream(JSONStream* stream, bool ref) const {
+void Function::PrintJSONImpl(JSONStream* stream, bool ref) const {
   const char* internal_name = String::Handle(name()).ToCString();
   const char* user_name =
       String::Handle(UserVisibleName()).ToCString();
@@ -6536,8 +6543,8 @@ const char* ClosureData::ToCString() const {
 }
 
 
-void ClosureData::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Object::PrintToJSONStream(stream, ref);
+void ClosureData::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Object::PrintJSONImpl(stream, ref);
 }
 
 
@@ -6571,8 +6578,8 @@ const char* RedirectionData::ToCString() const {
 }
 
 
-void RedirectionData::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Object::PrintToJSONStream(stream, ref);
+void RedirectionData::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Object::PrintJSONImpl(stream, ref);
 }
 
 
@@ -6776,7 +6783,7 @@ const char* Field::ToCString() const {
   return chars;
 }
 
-void Field::PrintToJSONStream(JSONStream* stream, bool ref) const {
+void Field::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   const char* internal_field_name = String::Handle(name()).ToCString();
   const char* field_name = String::Handle(UserVisibleName()).ToCString();
@@ -7048,8 +7055,8 @@ const char* LiteralToken::ToCString() const {
 }
 
 
-void LiteralToken::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Object::PrintToJSONStream(stream, ref);
+void LiteralToken::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Object::PrintJSONImpl(stream, ref);
 }
 
 
@@ -7493,8 +7500,8 @@ const char* TokenStream::ToCString() const {
 }
 
 
-void TokenStream::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Object::PrintToJSONStream(stream, ref);
+void TokenStream::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Object::PrintJSONImpl(stream, ref);
 }
 
 
@@ -7997,7 +8004,7 @@ const char* Script::ToCString() const {
 
 
 // See also Dart_ScriptGetTokenInfo.
-void Script::PrintToJSONStream(JSONStream* stream, bool ref) const {
+void Script::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   jsobj.AddProperty("type", JSONType(ref));
   const String& name = String::Handle(url());
@@ -9265,7 +9272,7 @@ const char* Library::ToCString() const {
 }
 
 
-void Library::PrintToJSONStream(JSONStream* stream, bool ref) const {
+void Library::PrintJSONImpl(JSONStream* stream, bool ref) const {
   const char* library_name = String::Handle(name()).ToCString();
   intptr_t id = index();
   ASSERT(id >= 0);
@@ -9562,8 +9569,8 @@ const char* LibraryPrefix::ToCString() const {
 }
 
 
-void LibraryPrefix::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Object::PrintToJSONStream(stream, ref);
+void LibraryPrefix::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Object::PrintJSONImpl(stream, ref);
 }
 
 
@@ -9616,8 +9623,8 @@ const char* Namespace::ToCString() const {
 }
 
 
-void Namespace::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Object::PrintToJSONStream(stream, ref);
+void Namespace::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Object::PrintJSONImpl(stream, ref);
 }
 
 
@@ -9882,8 +9889,8 @@ const char* Instructions::ToCString() const {
 }
 
 
-void Instructions::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Object::PrintToJSONStream(stream, ref);
+void Instructions::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Object::PrintJSONImpl(stream, ref);
 }
 
 
@@ -10034,8 +10041,8 @@ const char* PcDescriptors::ToCString() const {
 }
 
 
-void PcDescriptors::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Object::PrintToJSONStream(stream, ref);
+void PcDescriptors::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Object::PrintJSONImpl(stream, ref);
 }
 
 
@@ -10184,8 +10191,8 @@ const char* Stackmap::ToCString() const {
 }
 
 
-void Stackmap::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Object::PrintToJSONStream(stream, ref);
+void Stackmap::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Object::PrintJSONImpl(stream, ref);
 }
 
 
@@ -10259,9 +10266,9 @@ const char* LocalVarDescriptors::ToCString() const {
 }
 
 
-void LocalVarDescriptors::PrintToJSONStream(JSONStream* stream,
-                                            bool ref) const {
-  Object::PrintToJSONStream(stream, ref);
+void LocalVarDescriptors::PrintJSONImpl(JSONStream* stream,
+                                        bool ref) const {
+  Object::PrintJSONImpl(stream, ref);
 }
 
 
@@ -10443,9 +10450,9 @@ const char* ExceptionHandlers::ToCString() const {
 }
 
 
-void ExceptionHandlers::PrintToJSONStream(JSONStream* stream,
-                                          bool ref) const {
-  Object::PrintToJSONStream(stream, ref);
+void ExceptionHandlers::PrintJSONImpl(JSONStream* stream,
+                                      bool ref) const {
+  Object::PrintJSONImpl(stream, ref);
 }
 
 
@@ -10561,8 +10568,8 @@ bool DeoptInfo::VerifyDecompression(const GrowableArray<DeoptInstr*>& original,
 }
 
 
-void DeoptInfo::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Object::PrintToJSONStream(stream, ref);
+void DeoptInfo::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Object::PrintJSONImpl(stream, ref);
 }
 
 
@@ -11116,8 +11123,8 @@ RawICData* ICData::New(const Function& owner,
 }
 
 
-void ICData::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Object::PrintToJSONStream(stream, ref);
+void ICData::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Object::PrintJSONImpl(stream, ref);
 }
 
 
@@ -11600,7 +11607,7 @@ RawString* Code::UserName() const {
 }
 
 
-void Code::PrintToJSONStream(JSONStream* stream, bool ref) const {
+void Code::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   jsobj.AddProperty("type", JSONType(ref));
   jsobj.AddPropertyF("id", "code/%" Px64"-%" Px "", compile_timestamp(),
@@ -11812,8 +11819,8 @@ void Context::Dump(int indent) const {
 }
 
 
-void Context::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Object::PrintToJSONStream(stream, ref);
+void Context::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Object::PrintJSONImpl(stream, ref);
 }
 
 
@@ -11931,8 +11938,8 @@ const char* ContextScope::ToCString() const {
 }
 
 
-void ContextScope::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Object::PrintToJSONStream(stream, ref);
+void ContextScope::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Object::PrintJSONImpl(stream, ref);
 }
 
 
@@ -12047,8 +12054,8 @@ const char* MegamorphicCache::ToCString() const {
 }
 
 
-void MegamorphicCache::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Object::PrintToJSONStream(stream, ref);
+void MegamorphicCache::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Object::PrintJSONImpl(stream, ref);
 }
 
 
@@ -12123,8 +12130,8 @@ const char* SubtypeTestCache::ToCString() const {
 }
 
 
-void SubtypeTestCache::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Object::PrintToJSONStream(stream, ref);
+void SubtypeTestCache::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Object::PrintJSONImpl(stream, ref);
 }
 
 
@@ -12141,7 +12148,7 @@ const char* Error::ToCString() const {
 }
 
 
-void Error::PrintToJSONStream(JSONStream* stream, bool ref) const {
+void Error::PrintJSONImpl(JSONStream* stream, bool ref) const {
   UNREACHABLE();
 }
 
@@ -12186,7 +12193,7 @@ const char* ApiError::ToCString() const {
 }
 
 
-void ApiError::PrintToJSONStream(JSONStream* stream, bool ref) const {
+void ApiError::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   jsobj.AddProperty("type", "Error");
   jsobj.AddProperty("id", "");
@@ -12374,7 +12381,7 @@ const char* LanguageError::ToCString() const {
 }
 
 
-void LanguageError::PrintToJSONStream(JSONStream* stream, bool ref) const {
+void LanguageError::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   jsobj.AddProperty("type", "Error");
   jsobj.AddProperty("id", "");
@@ -12452,8 +12459,8 @@ const char* UnhandledException::ToCString() const {
 
 
 
-void UnhandledException::PrintToJSONStream(JSONStream* stream,
-                                           bool ref) const {
+void UnhandledException::PrintJSONImpl(JSONStream* stream,
+                                       bool ref) const {
   JSONObject jsobj(stream);
   jsobj.AddProperty("type", "Error");
   jsobj.AddProperty("id", "");
@@ -12499,7 +12506,7 @@ const char* UnwindError::ToCString() const {
 }
 
 
-void UnwindError::PrintToJSONStream(JSONStream* stream, bool ref) const {
+void UnwindError::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   jsobj.AddProperty("type", "Error");
   jsobj.AddProperty("id", "");
@@ -12944,16 +12951,11 @@ void Instance::PrintSharedInstanceJSON(JSONObject* jsobj, bool ref) const {
 }
 
 
-void Instance::PrintToJSONStream(JSONStream* stream, bool ref) const {
+void Instance::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
 
   // Handle certain special instance values.
-  if (IsNull()) {
-    jsobj.AddProperty("type", ref ? "@Null" : "Null");
-    jsobj.AddProperty("id", "objects/null");
-    jsobj.AddProperty("valueAsString", "null");
-    return;
-  } else if (raw() == Object::sentinel().raw()) {
+  if (raw() == Object::sentinel().raw()) {
     jsobj.AddProperty("type", ref ? "@Null" : "Null");
     jsobj.AddProperty("id", "objects/not-initialized");
     jsobj.AddProperty("valueAsString", "<not initialized>");
@@ -13418,7 +13420,7 @@ const char* AbstractType::ToCString() const {
 }
 
 
-void AbstractType::PrintToJSONStream(JSONStream* stream, bool ref) const {
+void AbstractType::PrintJSONImpl(JSONStream* stream, bool ref) const {
   UNREACHABLE();
 }
 
@@ -14022,7 +14024,7 @@ const char* Type::ToCString() const {
 }
 
 
-void Type::PrintToJSONStream(JSONStream* stream, bool ref) const {
+void Type::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   PrintSharedInstanceJSON(&jsobj, ref);
   if (IsCanonical()) {
@@ -14195,7 +14197,7 @@ const char* TypeRef::ToCString() const {
 }
 
 
-void TypeRef::PrintToJSONStream(JSONStream* stream, bool ref) const {
+void TypeRef::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   PrintSharedInstanceJSON(&jsobj, ref);
   ObjectIdRing* ring = Isolate::Current()->object_id_ring();
@@ -14412,7 +14414,7 @@ const char* TypeParameter::ToCString() const {
 }
 
 
-void TypeParameter::PrintToJSONStream(JSONStream* stream, bool ref) const {
+void TypeParameter::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   PrintSharedInstanceJSON(&jsobj, ref);
   ObjectIdRing* ring = Isolate::Current()->object_id_ring();
@@ -14616,7 +14618,7 @@ const char* BoundedType::ToCString() const {
 }
 
 
-void BoundedType::PrintToJSONStream(JSONStream* stream, bool ref) const {
+void BoundedType::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   PrintSharedInstanceJSON(&jsobj, ref);
   ObjectIdRing* ring = Isolate::Current()->object_id_ring();
@@ -14663,7 +14665,7 @@ const char* MixinAppType::ToCString() const {
 }
 
 
-void MixinAppType::PrintToJSONStream(JSONStream* stream, bool ref) const {
+void MixinAppType::PrintJSONImpl(JSONStream* stream, bool ref) const {
   UNREACHABLE();
 }
 
@@ -14711,7 +14713,7 @@ const char* Number::ToCString() const {
 }
 
 
-void Number::PrintToJSONStream(JSONStream* stream, bool ref) const {
+void Number::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   PrintSharedInstanceJSON(&jsobj, ref);
   ObjectIdRing* ring = Isolate::Current()->object_id_ring();
@@ -14728,8 +14730,8 @@ const char* Integer::ToCString() const {
 }
 
 
-void Integer::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Number::PrintToJSONStream(stream, ref);
+void Integer::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Number::PrintJSONImpl(stream, ref);
 }
 
 
@@ -15157,7 +15159,7 @@ const char* Smi::ToCString() const {
 }
 
 
-void Smi::PrintToJSONStream(JSONStream* stream, bool ref) const {
+void Smi::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   PrintSharedInstanceJSON(&jsobj, ref);
   jsobj.AddPropertyF("id", "objects/int-%" Pd "", Value());
@@ -15284,8 +15286,8 @@ const char* Mint::ToCString() const {
 }
 
 
-void Mint::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Number::PrintToJSONStream(stream, ref);
+void Mint::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Number::PrintJSONImpl(stream, ref);
 }
 
 
@@ -15390,8 +15392,8 @@ const char* Double::ToCString() const {
 }
 
 
-void Double::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Number::PrintToJSONStream(stream, ref);
+void Double::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Number::PrintJSONImpl(stream, ref);
 }
 
 
@@ -15566,8 +15568,8 @@ const char* Bigint::ToCString() const {
 }
 
 
-void Bigint::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Number::PrintToJSONStream(stream, ref);
+void Bigint::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Number::PrintJSONImpl(stream, ref);
 }
 
 
@@ -16421,7 +16423,7 @@ const char* String::ToUserCString(intptr_t max_len) const {
 }
 
 
-void String::PrintToJSONStream(JSONStream* stream, bool ref) const {
+void String::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   if (raw() == Symbols::OptimizedOut().raw()) {
     // TODO(turnidge): This is a hack.  The user could have this
@@ -17242,7 +17244,7 @@ const char* Bool::ToCString() const {
 }
 
 
-void Bool::PrintToJSONStream(JSONStream* stream, bool ref) const {
+void Bool::PrintJSONImpl(JSONStream* stream, bool ref) const {
   const char* str = ToCString();
   JSONObject jsobj(stream);
   jsobj.AddProperty("type", JSONType(ref));
@@ -17332,7 +17334,7 @@ const char* Array::ToCString() const {
 }
 
 
-void Array::PrintToJSONStream(JSONStream* stream, bool ref) const {
+void Array::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   PrintSharedInstanceJSON(&jsobj, ref);
   ObjectIdRing* ring = Isolate::Current()->object_id_ring();
@@ -17568,8 +17570,8 @@ const char* GrowableObjectArray::ToCString() const {
 }
 
 
-void GrowableObjectArray::PrintToJSONStream(JSONStream* stream,
-                                            bool ref) const {
+void GrowableObjectArray::PrintJSONImpl(JSONStream* stream,
+                                        bool ref) const {
   JSONObject jsobj(stream);
   PrintSharedInstanceJSON(&jsobj, ref);
   ObjectIdRing* ring = Isolate::Current()->object_id_ring();
@@ -17692,8 +17694,8 @@ const char* Float32x4::ToCString() const {
 }
 
 
-void Float32x4::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Instance::PrintToJSONStream(stream, ref);
+void Float32x4::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Instance::PrintJSONImpl(stream, ref);
 }
 
 
@@ -17797,8 +17799,8 @@ const char* Int32x4::ToCString() const {
 }
 
 
-void Int32x4::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Instance::PrintToJSONStream(stream, ref);
+void Int32x4::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Instance::PrintJSONImpl(stream, ref);
 }
 
 
@@ -17877,8 +17879,8 @@ const char* Float64x2::ToCString() const {
 }
 
 
-void Float64x2::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Instance::PrintToJSONStream(stream, ref);
+void Float64x2::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Instance::PrintJSONImpl(stream, ref);
 }
 
 
@@ -17928,8 +17930,8 @@ const char* TypedData::ToCString() const {
 }
 
 
-void TypedData::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Instance::PrintToJSONStream(stream, ref);
+void TypedData::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Instance::PrintJSONImpl(stream, ref);
 }
 
 
@@ -17962,9 +17964,9 @@ const char* ExternalTypedData::ToCString() const {
 }
 
 
-void ExternalTypedData::PrintToJSONStream(JSONStream* stream,
-                                          bool ref) const {
-  Instance::PrintToJSONStream(stream, ref);
+void ExternalTypedData::PrintJSONImpl(JSONStream* stream,
+                                      bool ref) const {
+  Instance::PrintJSONImpl(stream, ref);
 }
 
 
@@ -17987,8 +17989,8 @@ const char* Capability::ToCString() const {
 }
 
 
-void Capability::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Instance::PrintToJSONStream(stream, ref);
+void Capability::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Instance::PrintJSONImpl(stream, ref);
 }
 
 
@@ -18015,8 +18017,8 @@ const char* ReceivePort::ToCString() const {
 }
 
 
-void ReceivePort::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Instance::PrintToJSONStream(stream, ref);
+void ReceivePort::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Instance::PrintJSONImpl(stream, ref);
 }
 
 
@@ -18039,8 +18041,8 @@ const char* SendPort::ToCString() const {
 }
 
 
-void SendPort::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Instance::PrintToJSONStream(stream, ref);
+void SendPort::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Instance::PrintJSONImpl(stream, ref);
 }
 
 
@@ -18225,8 +18227,8 @@ const char* Stacktrace::ToCString() const {
 }
 
 
-void Stacktrace::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Instance::PrintToJSONStream(stream, ref);
+void Stacktrace::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Instance::PrintJSONImpl(stream, ref);
 }
 
 
@@ -18437,8 +18439,8 @@ const char* JSRegExp::ToCString() const {
 }
 
 
-void JSRegExp::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Instance::PrintToJSONStream(stream, ref);
+void JSRegExp::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Instance::PrintJSONImpl(stream, ref);
 }
 
 
@@ -18457,8 +18459,8 @@ const char* WeakProperty::ToCString() const {
 }
 
 
-void WeakProperty::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Instance::PrintToJSONStream(stream, ref);
+void WeakProperty::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Instance::PrintJSONImpl(stream, ref);
 }
 
 RawAbstractType* MirrorReference::GetAbstractTypeReferent() const {
@@ -18517,8 +18519,8 @@ const char* MirrorReference::ToCString() const {
 }
 
 
-void MirrorReference::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Instance::PrintToJSONStream(stream, ref);
+void MirrorReference::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Instance::PrintJSONImpl(stream, ref);
 }
 
 
@@ -18641,8 +18643,8 @@ const char* UserTag::ToCString() const {
 }
 
 
-void UserTag::PrintToJSONStream(JSONStream* stream, bool ref) const {
-  Instance::PrintToJSONStream(stream, ref);
+void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
+  Instance::PrintJSONImpl(stream, ref);
 }