Implementing inline caches for GenericBinaryOpStub. ...

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 107 matching lines @@
       ASSERT(position_ >= 0);
       ASSERT(statement_position_ >= 0);
     }
 
     // Check for breakable code target. Look in the original code as setting
     // break points can cause the code targets in the running (debugged) code to
     // be of a different kind than in the original code.
     if (RelocInfo::IsCodeTarget(rmode())) {
       Address target = original_rinfo()->target_address();
       Code* code = Code::GetCodeFromTargetAddress(target);
-      if (code->is_inline_cache_stub() || RelocInfo::IsConstructCall(rmode())) {
+      if ((code->is_inline_cache_stub()
+          && code->kind() != Code::BINARY_OP_IC) ||

[Mads Ager (chromium), 2010/01/22 12:14:26]

I would put the '&&' on the previous line.

if ((code->is_inline_cache_stub() &&
     code->kind() != Code::BINARY_OP_IC) ||
    RelocInfo::Is...(rmode))) {

[vladislav.kaznacheev, 2010/01/22 14:09:42]

Done.

+          RelocInfo::IsConstructCall(rmode())) {
         break_point_++;
         return;
       }
       if (code->kind() == Code::STUB) {
         if (IsDebuggerStatement()) {
           break_point_++;
           return;
         }
         if (type_ == ALL_BREAK_LOCATIONS) {
           if (Debug::IsBreakStub(code)) {
@@ skipping 1221 matching lines @@
     if (code->is_keyed_load_stub()) {
       Handle<Code> result =
           Handle<Code>(Builtins::builtin(Builtins::KeyedLoadIC_DebugBreak));
       return result;
     }
     if (code->is_keyed_store_stub()) {
       Handle<Code> result =
           Handle<Code>(Builtins::builtin(Builtins::KeyedStoreIC_DebugBreak));
       return result;
     }
+    UNREACHABLE();
   }
   if (RelocInfo::IsConstructCall(mode)) {
     Handle<Code> result =
         Handle<Code>(Builtins::builtin(Builtins::ConstructCall_DebugBreak));
     return result;
   }
   if (code->kind() == Code::STUB) {
     ASSERT(code->major_key() == CodeStub::CallFunction ||
            code->major_key() == CodeStub::StackCheck);
     Handle<Code> result =
@@ skipping 1359 matching lines @@
 
 
 void LockingCommandMessageQueue::Clear() {
   ScopedLock sl(lock_);
   queue_.Clear();
 }
 
 #endif  // ENABLE_DEBUGGER_SUPPORT
 
 } }  // namespace v8::internal