JSON.parse: properly deal with reviver result

src/js/json.js

 // Copyright 2009 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 (function(global, utils) {
 
 "use strict";
 
 %CheckIsBootstrapping();
 
@@ skipping 10 matching lines @@
 
 utils.Import(function(from) {
   MakeTypeError = from.MakeTypeError;
   MaxSimple = from.MaxSimple;
   MinSimple = from.MinSimple;
   ObjectHasOwnProperty = from.ObjectHasOwnProperty;
 });
 
 // -------------------------------------------------------------------
 
-function Revive(holder, name, reviver) {
+function InternalizeJSONProperty(holder, name, reviver) {
   var val = holder[name];
   if (IS_OBJECT(val)) {
     if (IS_ARRAY(val)) {

[Yang, 2015/12/08 14:21:54]

I thought IS_ARRAY is not the same as IsArray from the spec?

       var length = val.length;
       for (var i = 0; i < length; i++) {
-        var newElement = Revive(val, %_NumberToString(i), reviver);
-        val[i] = newElement;
+        var newElement =
+            InternalizeJSONProperty(val, %_NumberToString(i), reviver);
+        if (IS_UNDEFINED(newElement)) {
+          delete val[i];
+        } else {
+          val[i] = newElement;

[Yang, 2015/12/08 14:21:54]

is this equivalent to CreateDataProperty? What if val has a getter defined for
i?

[adamk, 2015/12/09 23:49:20]

What was the response to this comment? Perhaps this is related to
https://bugs.chromium.org/p/v8/issues/detail?id=3139?

+        }
       }
     } else {
       for (var p in val) {
         if (HAS_OWN_PROPERTY(val, p)) {
-          var newElement = Revive(val, p, reviver);
+          var newElement = InternalizeJSONProperty(val, p, reviver);
           if (IS_UNDEFINED(newElement)) {
             delete val[p];
           } else {
             val[p] = newElement;
           }
         }
       }
     }
   }
   return %_Call(reviver, holder, name, val);
 }
 
 
 function JSONParse(text, reviver) {
   var unfiltered = %ParseJson(text);
   if (IS_CALLABLE(reviver)) {
-    return Revive({'': unfiltered}, '', reviver);
+    return InternalizeJSONProperty({'': unfiltered}, '', reviver);
   } else {
     return unfiltered;
   }
 }
 
 
 function SerializeArray(value, replacer, stack, indent, gap) {
   if (!%PushIfAbsent(stack, value)) throw MakeTypeError(kCircularStructure);
   var stepback = indent;
   indent += gap;
@@ skipping 176 matching lines @@
 function JsonSerializeAdapter(key, object) {
   var holder = {};
   holder[key] = object;
   // No need to pass the actual holder since there is no replacer function.
   return JSONSerialize(key, holder, UNDEFINED, new InternalArray(), "", "");
 }
 
 %InstallToContext(["json_serialize_adapter", JsonSerializeAdapter]);
 
 })