Fix debugger function that treated retry-after-gc failure as an...

src/runtime.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 4607 matching lines @@
       return value;
     case CONSTANT_FUNCTION:
       return result->GetConstantFunction();
     case CALLBACKS: {
       Object* structure = result->GetCallbackObject();
       if (structure->IsProxy()) {
         AccessorDescriptor* callback =
             reinterpret_cast<AccessorDescriptor*>(
                 Proxy::cast(structure)->proxy());
         value = (callback->getter)(receiver, callback->data);
-        if (value->IsFailure()) {
+        if (value->IsException()) {
           value = Top::pending_exception();
           Top::clear_pending_exception();
           if (caught_exception != NULL) {
             *caught_exception = true;
           }
         }
         return value;
       } else {
         return Heap::undefined_value();
       }
@@ skipping 59 matching lines @@
     if (result.IsProperty()) {
       break;
     }
     if (i < length - 1) {
       jsproto = Handle<JSObject>(JSObject::cast(jsproto->GetPrototype()));
     }
   }
 
   if (result.IsProperty()) {
     bool caught_exception = false;
-    Handle<Object> value(DebugLookupResultValue(*obj, &result,
-                                                &caught_exception));
+    Object* value = DebugLookupResultValue(*obj, &result,
+                                           &caught_exception);
+    if (value->IsFailure()) return value;
+    Handle<Object> value_handle(value);
     // If the callback object is a fixed array then it contains JavaScript
     // getter and/or setter.
     bool hasJavaScriptAccessors = result.type() == CALLBACKS &&
                                   result.GetCallbackObject()->IsFixedArray();
     Handle<FixedArray> details =
         Factory::NewFixedArray(hasJavaScriptAccessors ? 5 : 2);
-    details->set(0, *value);
+    details->set(0, *value_handle);
     details->set(1, result.GetPropertyDetails().AsSmi());
     if (hasJavaScriptAccessors) {
       details->set(2,
                    caught_exception ? Heap::true_value() : Heap::false_value());
       details->set(3, FixedArray::cast(result.GetCallbackObject())->get(0));
       details->set(4, FixedArray::cast(result.GetCallbackObject())->get(1));
     }
 
     return *Factory::NewJSArrayWithElements(details);
   }
@@ skipping 1362 matching lines @@
   } else {
     // Handle last resort GC and make sure to allow future allocations
     // to grow the heap without causing GCs (if possible).
     Counters::gc_last_resort_from_js.Increment();
     Heap::CollectAllGarbage();
   }
 }
 
 
 } }  // namespace v8::internal