Merged r16534 into trunk branch.

src/liveedit.cc

 // Copyright 2012 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 1229 matching lines @@
   int inlined_count = data->InlinedFunctionCount()->value();
   for (int i = 0; i < inlined_count; ++i) {
     JSFunction* inlined = JSFunction::cast(literals->get(i));
     if (inlined->shared() == candidate) return true;
   }
 
   return false;
 }
 
 
-static void DeoptimizeDependentFunctions(SharedFunctionInfo* function_info) {
-  // Marks code that shares the same shared function info or has inlined
-  // code that shares the same function info.
-  class DependentFunctionMarker: public OptimizedFunctionVisitor {
-   public:
-    SharedFunctionInfo* shared_info_;
-    bool found_;
+// Marks code that shares the same shared function info or has inlined
+// code that shares the same function info.
+class DependentFunctionMarker: public OptimizedFunctionVisitor {
+ public:
+  SharedFunctionInfo* shared_info_;
+  bool found_;
 
-    explicit DependentFunctionMarker(SharedFunctionInfo* shared_info)
-      : shared_info_(shared_info), found_(false) { }
+  explicit DependentFunctionMarker(SharedFunctionInfo* shared_info)
+    : shared_info_(shared_info), found_(false) { }
 
-    virtual void EnterContext(Context* context) { }  // Don't care.
-    virtual void LeaveContext(Context* context)  { }  // Don't care.
-    virtual void VisitFunction(JSFunction* function) {
-      // It should be guaranteed by the iterator that everything is optimized.
-      ASSERT(function->code()->kind() == Code::OPTIMIZED_FUNCTION);
-      if (shared_info_ == function->shared() ||
-          IsInlined(function, shared_info_)) {
-        // mark the code for deoptimization
-        function->code()->set_marked_for_deoptimization(true);
-        found_ = true;
-      }
+  virtual void EnterContext(Context* context) { }  // Don't care.
+  virtual void LeaveContext(Context* context)  { }  // Don't care.
+  virtual void VisitFunction(JSFunction* function) {
+    // It should be guaranteed by the iterator that everything is optimized.
+    ASSERT(function->code()->kind() == Code::OPTIMIZED_FUNCTION);
+    if (shared_info_ == function->shared() ||
+        IsInlined(function, shared_info_)) {
+      // Mark the code for deoptimization.
+      function->code()->set_marked_for_deoptimization(true);
+      found_ = true;
     }
-  };
+  }
+};
 
 
+static void DeoptimizeDependentFunctions(SharedFunctionInfo* function_info) {
   DisallowHeapAllocation no_allocation;
   DependentFunctionMarker marker(function_info);
   // TODO(titzer): need to traverse all optimized code to find OSR code here.
   Deoptimizer::VisitAllOptimizedFunctions(function_info->GetIsolate(), &marker);
 
   if (marker.found_) {
     // Only go through with the deoptimization if something was found.
     Deoptimizer::DeoptimizeMarkedCode(function_info->GetIsolate());
   }
 }
@@ skipping 866 matching lines @@
 
 bool LiveEditFunctionTracker::IsActive(Isolate* isolate) {
   return false;
 }
 
 #endif  // ENABLE_DEBUGGER_SUPPORT
 
 
 
 } }  // namespace v8::internal