Properly set function index in CallSite constructor

src/builtins/builtins-callsite.cc

 // Copyright 2016 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.
 
 #include "src/builtins/builtins.h"
 #include "src/builtins/builtins-utils.h"
 
 #include "src/string-builder.h"
 #include "src/wasm/wasm-module.h"
 
@@ skipping 45 matching lines @@
                               Object::TypeOf(isolate, receiver),
                               Object::TypeOf(isolate, fun)));
   }
 
   if (is_wasm_object) {
     DCHECK(!fun->IsJSFunction());
     SET_CALLSITE_PROPERTY(obj, call_site_wasm_obj_symbol, receiver);
 
     Handle<Object> fun_index;
     ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, fun_index,
                                        Object::ToUint32(isolate, fun));

[Yang, 2016/08/01 09:11:46]

I think having the integer conversion in the original JS code was just defensive
programming. Let's instead assert that this is a smi. And assert that
wasm::GetNumberOfFunctions(receiver) is larger than the index.

[jgruber, 2016/08/01 12:04:23]

Done.

-    SET_CALLSITE_PROPERTY(obj, call_site_wasm_func_index_symbol, fun);
+    SET_CALLSITE_PROPERTY(obj, call_site_wasm_func_index_symbol, fun_index);
   } else {
     DCHECK(fun->IsJSFunction());
     SET_CALLSITE_PROPERTY(obj, call_site_receiver_symbol, receiver);
     SET_CALLSITE_PROPERTY(obj, call_site_function_symbol, fun);
   }
 
   Handle<Object> pos_int32;
   ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, pos_int32,
                                      Object::ToInt32(isolate, pos));

[Yang, 2016/08/01 09:11:46]

Same here. Let's assert that this is a smi.

[jgruber, 2016/08/01 12:04:23]

Done.

   SET_CALLSITE_PROPERTY(obj, call_site_position_symbol, pos_int32);
   SET_CALLSITE_PROPERTY(
       obj, call_site_strict_symbol,
       isolate->factory()->ToBoolean(strict_mode->BooleanValue()));
 
   return *obj;
 }
 
 #undef SET_CALLSITE_PROPERTY
 
@@ skipping 518 matching lines @@
       isolate, AppendFileLocation(isolate, recv, &call_site, &builder));
   builder.AppendCString(")");
 
   RETURN_RESULT_OR_FAILURE(isolate, builder.Finish());
 }
 
 #undef CHECK_CALLSITE
 
 }  // namespace internal
 }  // namespace v8