Revert last revert.

TBR=whesse@chromium.org
Review URL: http://codereview.chromium.org/8286023

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@9635 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

src/hydrogen.cc

@@ -4539,9 +4539,9 @@ bool HGraphBuilder::TryInline(Call* expr) {
     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,10 +4564,14 @@ bool HGraphBuilder::TryInline(Call* expr) {
   }
 
   // Don't inline recursive functions.
-  if (*target_shared == outer_info->closure()->shared()) {
+  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;
     }
+  }
 
   // We don't want to add more than a certain number of nodes from inlining.
   if (FLAG_limit_inlining && inlined_count_ > kMaxInlinedNodes) {
@@ -5071,18 +5075,25 @@ void HGraphBuilder::VisitCall(Call* expr) {
         // 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()) {
+          if (context->if_true()->HasPredecessor() &&
+              context->if_true()->last_environment()->Top() == function) {
             context->if_true()->last_environment()->Drop(1);
           }
-          if (context->if_false()->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);
           }
         } else {
           UNREACHABLE();
@@ -5302,7 +5313,6 @@ void HGraphBuilder::VisitBitNot(UnaryOperation* expr) {
 
 
 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(),

src/ia32/full-codegen-ia32.cc

@@ -2104,7 +2104,7 @@ void FullCodeGenerator::EmitCallWithStub(Call* expr, CallFunctionFlags flags) {
     flags = static_cast<CallFunctionFlags>(flags | RECORD_CALL_TARGET);
   }
   CallFunctionStub stub(arg_count, flags);
-  __ CallStub(&stub);
+  __ CallStub(&stub, expr->id());
   if (record_call_target) {
     // There is a one element cache in the instruction stream.
 #ifdef DEBUG

src/parser.cc

@@ -5196,7 +5196,7 @@ bool ParserApi::Parse(CompilationInfo* info) {
   Handle<Script> script = info->script();
   bool harmony_scoping = !info->is_native() && FLAG_harmony_scoping;
   if (info->is_lazy()) {
-    Parser parser(script, info->isolate()->bootstrapper()->IsActive() || info->allows_natives_syntax(), NULL, NULL);
+    Parser parser(script, true, NULL, NULL);
     parser.SetHarmonyScoping(harmony_scoping);
     result = parser.ParseLazy(info);
   } else {

src/type-info.cc

@@ -496,15 +496,9 @@ void TypeFeedbackOracle::RelocateRelocInfos(ZoneList<RelocInfo>* infos,
 
 void TypeFeedbackOracle::ProcessRelocInfos(ZoneList<RelocInfo>* infos) {
   for (int i = 0; i < infos->length(); i++) {
-    Address target_address = (*infos)[i].target_address();
+    RelocInfo reloc_entry = (*infos)[i];
+    Address target_address = reloc_entry.target_address();
     unsigned ast_id = static_cast<unsigned>((*infos)[i].data());
-    ProcessTargetAt(target_address, ast_id);
-  }
-}
-
-
-void TypeFeedbackOracle::ProcessTargetAt(Address target_address,
-                                         unsigned ast_id) {
     Code* target = Code::GetCodeFromTargetAddress(target_address);
     switch (target->kind()) {
       case Code::LOAD_IC:
@@ -542,7 +536,7 @@ void TypeFeedbackOracle::ProcessTargetAt(Address target_address,
       case Code::STUB:
         if (target->major_key() == CodeStub::CallFunction &&
             target->has_function_cache()) {
-        Object* value = CallFunctionStub::GetCachedValue(target_address);
+          Object* value = CallFunctionStub::GetCachedValue(reloc_entry.pc());
           if (value->IsJSFunction()) {
             SetInfo(ast_id, value);
           }
@@ -552,6 +546,7 @@ void TypeFeedbackOracle::ProcessTargetAt(Address target_address,
       default:
         break;
     }
+  }
 }
 
 

src/type-info.h

@@ -277,7 +277,6 @@ class TypeFeedbackOracle BASE_EMBEDDED {
                           byte* old_start,
                           byte* new_start);
   void ProcessRelocInfos(ZoneList<RelocInfo>* infos);
-  void ProcessTargetAt(Address target_address, unsigned ast_id);
 
   // Returns an element from the backing store. Returns undefined if
   // there is no information.