Revert r11425 because of V8 benchmark performance regression.

src/objects-inl.h

Index: src/objects-inl.h
diff --git a/src/objects-inl.h b/src/objects-inl.h
index 15bdc5221ebf221e1a05c9d7a65a4c268243daa8..677d567b7a323441078714b02ebc87c18864b404 100644
--- a/src/objects-inl.h
+++ b/src/objects-inl.h
@@ -3511,6 +3511,7 @@ ACCESSORS(SharedFunctionInfo, debug_info, Object, kDebugInfoOffset)
 ACCESSORS(SharedFunctionInfo, inferred_name, String, kInferredNameOffset)
 ACCESSORS(SharedFunctionInfo, this_property_assignments, Object,
           kThisPropertyAssignmentsOffset)
+SMI_ACCESSORS(SharedFunctionInfo, ic_age, kICAgeOffset)
 
 
 BOOL_ACCESSORS(FunctionTemplateInfo, flag, hidden_prototype,
@@ -3561,8 +3562,6 @@ SMI_ACCESSORS(SharedFunctionInfo, this_property_assignments_count,
 SMI_ACCESSORS(SharedFunctionInfo, opt_count, kOptCountOffset)
 SMI_ACCESSORS(SharedFunctionInfo, ast_node_count, kAstNodeCountOffset)
 SMI_ACCESSORS(SharedFunctionInfo, deopt_counter, kDeoptCounterOffset)
-SMI_ACCESSORS(SharedFunctionInfo, ic_age, kICAgeOffset)
-SMI_ACCESSORS(SharedFunctionInfo, opt_reenable_tries, kOptReenableTriesOffset)
 #else
 
 #define PSEUDO_SMI_ACCESSORS_LO(holder, name, offset)             \
@@ -3616,11 +3615,6 @@ PSEUDO_SMI_ACCESSORS_HI(SharedFunctionInfo, opt_count, kOptCountOffset)
 
 PSEUDO_SMI_ACCESSORS_LO(SharedFunctionInfo, ast_node_count, kAstNodeCountOffset)
 PSEUDO_SMI_ACCESSORS_HI(SharedFunctionInfo, deopt_counter, kDeoptCounterOffset)
-
-PSEUDO_SMI_ACCESSORS_LO(SharedFunctionInfo, ic_age, kICAgeOffset)
-PSEUDO_SMI_ACCESSORS_HI(SharedFunctionInfo,
-                        opt_reenable_tries,
-                        kOptReenableTriesOffset)
 #endif
 
 
@@ -3660,7 +3654,6 @@ void SharedFunctionInfo::set_optimization_disabled(bool disable) {
   // it will not be counted as optimizable code.
   if ((code()->kind() == Code::FUNCTION) && disable) {
     code()->set_optimizable(false);
-    code()->set_profiler_ticks(0);
   }
 }
 
@@ -3696,23 +3689,6 @@ bool SharedFunctionInfo::is_classic_mode() {
   return !BooleanBit::get(compiler_hints(), kStrictModeFunction);
 }
 
-
-void SharedFunctionInfo::TryReenableOptimization() {
-  int tries = opt_reenable_tries();
-  if (tries == Smi::kMaxValue) {
-    tries = 0;
-  }
-  set_opt_reenable_tries(tries + 1);
-  // We reenable optimization whenever the number of tries is a large
-  // enough power of 2.
-  if (tries >= 4 && (((tries - 1) & tries) == 0)) {
-    set_optimization_disabled(false);
-    set_opt_count(0);
-    code()->set_optimizable(true);
-  }
-}
-
-
 BOOL_GETTER(SharedFunctionInfo, compiler_hints, is_extended_mode,
             kExtendedModeFunction)
 BOOL_ACCESSORS(SharedFunctionInfo, compiler_hints, native, kNative)