Fix issue http://code.google.com/p/v8/issues/detail?id=32...

src/ic.cc

 // Copyright 2006-2008 Google Inc. 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 232 matching lines @@
   SetTargetAtAddress(address, initialize_stub());
 }
 
 
 void KeyedStoreIC::Clear(Address address, Code* target) {
   if (target->ic_state() == UNINITIALIZED) return;
   SetTargetAtAddress(address, initialize_stub());
 }
 
 
+Object* CallIC::TryCallAsFunction(Object* object) {
+  HandleScope scope;
+  Handle<Object> target(object);
+  Handle<Object> delegate = Execution::GetFunctionDelegate(target);
+
+  if (delegate->IsJSFunction()) {
+    // Patch the receiver and use the delegate as the function to
+    // invoke. This is used for invoking objects as if they were
+    // functions.
+    const int argc = this->target()->arguments_count();
+    StackFrameLocator locator;
+    JavaScriptFrame* frame = locator.FindJavaScriptFrame(0);
+    int index = frame->ComputeExpressionsCount() - (argc + 1);
+    frame->SetExpression(index, *target);
+  }
+
+  return *delegate;
+}
+
+  
 Object* CallIC::LoadFunction(State state,
                              Handle<Object> object,
                              Handle<String> name) {
   // If the object is undefined or null it's illegal to try to get any
   // of its properties; throw a TypeError in that case.
   if (object->IsUndefined() || object->IsNull()) {
     return TypeError("non_object_property_call", object, name);
   }
 
+  Object* result = Heap::the_hole_value();
+
+  // Check if the name is trivially convertible to an index and get
+  // the element if so.
+  uint32_t index;
+  if (name->AsArrayIndex(&index)) {
+    result = object->GetElement(index);
+    if (result->IsJSFunction()) return result;
+
+    // Try to find a suitable function delegate for the object at hand.
+    result = TryCallAsFunction(result);
+    if (result->IsJSFunction()) return result;

[Kasper Lund, 2008/09/08 05:27:21]

Do you really want to continue with a doing a normal lookup here? Isn't that
going to fail all the time? If that's the case at least it should be documented
in a comment here.

[Feng Qian, 2008/09/08 18:58:48]

It will fail in lookup step, a comment is sufficient, I think, instead of
duplicating code here.

On 2008/09/08 05:27:21, Kasper Lund wrote:

+  }
+
   // Lookup the property in the object.
   LookupResult lookup;
   object->Lookup(*name, &lookup);
 
-  Object* result = Heap::the_hole_value();
-
   if (!lookup.IsValid()) {
     // If the object does not have the requested property, check which
     // exception we need to throw.
     if (is_contextual()) {
       return ReferenceError("not_defined", name);
     }
     return TypeError("undefined_method", object, name);
   }
 
   // Lookup is valid: Update inline cache and stub cache.
@@ skipping 43 matching lines @@
           Top::context()->builtins()) {
         HandleScope scope;
         Handle<SharedFunctionInfo> shared(JSFunction::cast(result)->shared());
         Debug::FloodWithOneShot(shared);
       }
     }
     return result;
   }
 
   // Try to find a suitable function delegate for the object at hand.
-  HandleScope scope;
-  Handle<Object> target(result);
-  Handle<Object> delegate = Execution::GetFunctionDelegate(target);
-
-  if (delegate->IsJSFunction()) {
-    // Patch the receiver and use the delegate as the function to
-    // invoke. This is used for invoking objects as if they were
-    // functions.
-    const int argc = this->target()->arguments_count();
-    StackFrameLocator locator;
-    JavaScriptFrame* frame = locator.FindJavaScriptFrame(0);
-    int index = frame->ComputeExpressionsCount() - (argc + 1);
-    frame->SetExpression(index, *target);
-    return *delegate;
-  } else {
-    return TypeError("property_not_function", object, name);
-  }
+  result = TryCallAsFunction(result);
+  return result->IsJSFunction() ?
+    result : TypeError("property_not_function", object, name);

[Kasper Lund, 2008/09/08 05:27:21]

Isn't this usually indented with 4 spaces? I can't remember.

[Feng Qian, 2008/09/08 18:58:48]

Done.

 }
 
 
 void CallIC::UpdateCaches(LookupResult* lookup,
                           State state,
                           Handle<Object> object,
                           Handle<String> name) {
   ASSERT(lookup->IsLoaded());
   // Bail out if we didn't find a result.
   if (!lookup->IsValid() || !lookup->IsCacheable()) return;
@@ skipping 772 matching lines @@
 #undef ADDR
 };
 
 
 Address IC::AddressFromUtilityId(IC::UtilityId id) {
   return IC_utilities[id];
 }
 
 
 } }  // namespace v8::internal