Revert r9619.

src/hydrogen.cc

Index: src/hydrogen.cc
===================================================================
--- src/hydrogen.cc	(revision 9631)
+++ src/hydrogen.cc	(working copy)
@@ -4539,9 +4539,9 @@
     return false;
   }
 
+  CompilationInfo* outer_info = info();
 #if !defined(V8_TARGET_ARCH_IA32)
   // Target must be able to use caller's context.
-  CompilationInfo* outer_info = info();
   if (target->context() != outer_info->closure()->context() ||
       outer_info->scope()->contains_with() ||
       outer_info->scope()->num_heap_slots() > 0) {
@@ -4564,13 +4564,9 @@
   }
 
   // Don't inline recursive functions.
-  for (FunctionState* state = function_state();
-       state != NULL;
-       state = state->outer()) {
-    if (state->compilation_info()->closure()->shared() == *target_shared) {
-      TraceInline(target, caller, "target is recursive");
-      return false;
-    }
+  if (*target_shared == outer_info->closure()->shared()) {
+    TraceInline(target, caller, "target is recursive");
+    return false;
   }
 
   // We don't want to add more than a certain number of nodes from inlining.
@@ -5075,25 +5071,18 @@
         // The function is lingering in the deoptimization environment.
         // Handle it by case analysis on the AST context.
         if (ast_context()->IsEffect()) {
-          if (current_block() == NULL) return;
-          ASSERT(Top() == function);
           Drop(1);
         } else if (ast_context()->IsValue()) {
-          if (current_block() == NULL) return;
           HValue* result = Pop();
-          ASSERT(Top() == function);
           Drop(1);
           Push(result);
         } else if (ast_context()->IsTest()) {
-          ASSERT(current_block() == NULL);
           TestContext* context = TestContext::cast(ast_context());
-          if (context->if_true()->HasPredecessor() &&
-              context->if_true()->last_environment()->Top() == function) {
+          if (context->if_true()->HasPredecessor()) {
             context->if_true()->last_environment()->Drop(1);
           }
-          if (context->if_false()->HasPredecessor() &&
-              context->if_false()->last_environment()->Top() == function) {
-            context->if_false()->last_environment()->Drop(1);
+          if (context->if_false()->HasPredecessor()) {
+            context->if_true()->last_environment()->Drop(1);
           }
         } else {
           UNREACHABLE();
@@ -5313,6 +5302,7 @@
 
 
 void HGraphBuilder::VisitNot(UnaryOperation* expr) {
+  // TODO(svenpanne) Perhaps a switch/virtual function is nicer here.
   if (ast_context()->IsTest()) {
     TestContext* context = TestContext::cast(ast_context());
     VisitForControl(expr->expression(),