Fix JSON.stringify for objects with interceptor handlers.

src/json-stringifier.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 58 matching lines @@
   }
 
   INLINE(void Append(const char* chars)) {
     if (is_ascii_) {
       Append_<true>(chars);
     } else {
       Append_<false>(chars);
     }
   }
 
-  Handle<Object> GetProperty(Handle<JSObject> object,
-                             Handle<String> key);
-
   Handle<Object> ApplyToJsonFunction(Handle<Object> object,
                                      Handle<Object> key);
 
   Result SerializeGeneric(Handle<Object> object,
                           Handle<Object> key,
                           bool deferred_comma,
                           bool deferred_key);
 
   // Entry point to serialize the object.
   INLINE(Result SerializeObject(Handle<Object> obj)) {
@@ skipping 163 matching lines @@
   if (current_index_ == part_length_) Extend();
 }
 
 
 template <bool is_ascii, typename Char>
 void BasicJsonStringifier::Append_(const Char* chars) {
   for ( ; *chars != '\0'; chars++) Append_<is_ascii, Char>(*chars);
 }
 
 
-Handle<Object> BasicJsonStringifier::GetProperty(Handle<JSObject> object,
-                                                 Handle<String> key) {
-  LookupResult lookup(isolate_);
-  object->LocalLookupRealNamedProperty(*key, &lookup);
-  if (!lookup.IsProperty()) return factory_->undefined_value();
-  switch (lookup.type()) {
-    case NORMAL: {
-      Object* value = lookup.holder()->GetNormalizedProperty(&lookup);
-      ASSERT(!value->IsTheHole());
-      return Handle<Object>(value, isolate_);
-    }
-    case FIELD: {
-      Object* value = lookup.holder()->FastPropertyAt(
-          lookup.GetFieldIndex().field_index());
-      ASSERT(!value->IsTheHole());
-      return Handle<Object>(value, isolate_);
-    }
-    case CONSTANT_FUNCTION:
-      return Handle<Object>(lookup.GetConstantFunction(), isolate_);
-    default: {
-      PropertyAttributes attr;
-      return Object::GetProperty(object, object, &lookup, key, &attr);
-    }
-  }
-  return Handle<Object>::null();
-}
-
-
 Handle<Object> BasicJsonStringifier::ApplyToJsonFunction(
     Handle<Object> object, Handle<Object> key) {
   LookupResult lookup(isolate_);
   JSObject::cast(*object)->LookupRealNamedProperty(*tojson_symbol_, &lookup);
   if (!lookup.IsProperty()) return object;
   PropertyAttributes attr;
   Handle<Object> fun =
       Object::GetProperty(object, object, &lookup, tojson_symbol_, &attr);
   if (!fun->IsJSFunction()) return object;
 
@@ skipping 90 matching lines @@
   }
 }
 
 
 BasicJsonStringifier::Result BasicJsonStringifier::SerializeGeneric(
     Handle<Object> object,
     Handle<Object> key,
     bool deferred_comma,
     bool deferred_key) {
   Handle<JSObject> builtins(isolate_->native_context()->builtins());
-  Handle<JSFunction> builtin = Handle<JSFunction>::cast(
-      v8::internal::GetProperty(builtins, "JSONSerializeAdapter"));
+  Handle<JSFunction> builtin =
+      Handle<JSFunction>::cast(GetProperty(builtins, "JSONSerializeAdapter"));
 
   Handle<Object> argv[] = { key, object };
   bool has_exception = false;
   Handle<Object> result =
       Execution::Call(builtin, object, 2, argv, &has_exception);
   if (has_exception) return EXCEPTION;
   if (result->IsUndefined()) return UNCHANGED;
   if (deferred_key) {
     if (key->IsSmi()) key = factory_->NumberToString(key);
     SerializeDeferredKey(deferred_comma, key);
@@ skipping 377 matching lines @@
       SerializeString_<false, char>(flat.ToAsciiVector(), object);
     } else {
       SerializeString_<false, uc16>(flat.ToUC16Vector(), object);
     }
   }
 }
 
 } }  // namespace v8::internal
 
 #endif  // V8_JSON_STRINGIFIER_H_