Fixed step in handling for function.call

src/debug.cc

 // Copyright 2006-2008 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 1142 matching lines @@
       it.Advance();
     }
     fp = it.frame()->fp();
   }
 
   // Flood the function with one-shot break points if it is called from where
   // step into was requested.
   if (fp == Debug::step_in_fp()) {
     // Don't allow step into functions in the native context.
     if (function->context()->global() != Top::context()->builtins()) {
       if (function->shared()->code() ==

[Kasper Lund, 2009/04/07 12:15:14]

How about caching function->shared()->code() in a local variable? It makes it a
tiny bit easier to read.

-          Builtins::builtin(Builtins::FunctionApply)) {
-        // Handle function.apply separately to flood the function to be called
-        // and not the code for Builtins::FunctionApply. At the point of the
-        // call IC to call Builtins::FunctionApply the expression stack has the
-        // following content:
-        //   symbol "apply"
-        //   function apply was called on
-        //   receiver for apply (first parameter to apply)
-        //   arguments array for apply (second parameter to apply)
+          Builtins::builtin(Builtins::FunctionApply) ||
+          function->shared()->code() ==
+          Builtins::builtin(Builtins::FunctionCall)) {
+        // Handle function.apply and function.call separately to flood the
+        // function to be called and not the code for Builtins::FunctionApply or
+        // Builtins::FunctionCall. At the point of the call IC to call either
+        // Builtins::FunctionApply or Builtins::FunctionCall the expression
+        // stack has the following content:
+        //   symbol "apply" or "call"
+        //   function apply or call was called on
+        //   receiver for apply or call (first parameter to apply or call)
+        //   ... further arguments to apply or call.
         JavaScriptFrameIterator it;
         ASSERT(it.frame()->fp() == fp);
         ASSERT(it.frame()->GetExpression(1)->IsJSFunction());
         if (it.frame()->GetExpression(1)->IsJSFunction()) {
           Handle<JSFunction>
               actual_function(JSFunction::cast(it.frame()->GetExpression(1)));
           Handle<SharedFunctionInfo> actual_shared(actual_function->shared());
           Debug::FloodWithOneShot(actual_shared);
         }
       } else {
@@ skipping 1022 matching lines @@
 }
 
 
 void LockingMessageQueue::Clear() {
   ScopedLock sl(lock_);
   queue_.Clear();
 }
 
 
 } }  // namespace v8::internal