Rollback trunk to 3.21.16.2

src/debug.cc

Index: src/debug.cc
diff --git a/src/debug.cc b/src/debug.cc
index 63d33eb5fb601f269b4f91c462adf510550d0b43..0496b8cb007603fca8d93d0ec6d3af716967c3c6 100644
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -1793,14 +1793,10 @@ void Debug::HandleStepIn(Handle<JSFunction> function,
         // function to be called and not the code for Builtins::FunctionApply or
         // Builtins::FunctionCall. The receiver of call/apply is the target
         // function.
-        if (!holder.is_null() && holder->IsJSFunction()) {
+        if (!holder.is_null() && holder->IsJSFunction() &&
+            !JSFunction::cast(*holder)->IsBuiltin()) {
           Handle<JSFunction> js_function = Handle<JSFunction>::cast(holder);
-          if (!js_function->IsBuiltin()) {
-            Debug::FloodWithOneShot(js_function);
-          } else if (js_function->shared()->bound()) {
-            // Handle Function.prototype.bind
-            Debug::FloodBoundFunctionWithOneShot(js_function);
-          }
+          Debug::FloodWithOneShot(js_function);
         }
       } else {
         Debug::FloodWithOneShot(function);