Add asserts and state tracking to ensure that we do not call

src/ia32/builtins-ia32.cc

 // Copyright 2011 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 96 matching lines @@
 }
 
 
 static void Generate_JSConstructStubHelper(MacroAssembler* masm,
                                            bool is_api_function,
                                            bool count_constructions) {
   // Should never count constructions for api objects.
   ASSERT(!is_api_function || !count_constructions);
 
   // Enter a construct frame.
-  __ EnterConstructFrame();
+{
+  FrameScope scope(masm, StackFrame::CONSTRUCT);
 
   // Store a smi-tagged arguments count on the stack.
   __ SmiTag(eax);
   __ push(eax);
 
   // Push the function to invoke on the stack.
   __ push(edi);
 
-  // Try to allocate the object without transitioning into C code. If any of the
-  // preconditions is not met, the code bails out to the runtime call.
+  // Try to allocate the object without transitioning into C code. If any of
+  // the preconditions is not met, the code bails out to the runtime call.
   Label rt_call, allocated;
   if (FLAG_inline_new) {
     Label undo_allocation;
 #ifdef ENABLE_DEBUGGER_SUPPORT
     ExternalReference debug_step_in_fp =
         ExternalReference::debug_step_in_fp_address(masm->isolate());
     __ cmp(Operand::StaticVariable(debug_step_in_fp), Immediate(0));
     __ j(not_equal, &rt_call);
 #endif
 
     // Verified that the constructor is a JSFunction.
     // Load the initial map and verify that it is in fact a map.
     // edi: constructor
     __ mov(eax, FieldOperand(edi, JSFunction::kPrototypeOrInitialMapOffset));
     // Will both indicate a NULL and a Smi
     __ test(eax, Immediate(kSmiTagMask));
     __ j(zero, &rt_call);
     // edi: constructor
     // eax: initial map (if proven valid below)
     __ CmpObjectType(eax, MAP_TYPE, ebx);
     __ j(not_equal, &rt_call);
 
-    // Check that the constructor is not constructing a JSFunction (see comments
-    // in Runtime_NewObject in runtime.cc). In which case the initial map's
-    // instance type would be JS_FUNCTION_TYPE.
+    // Check that the constructor is not constructing a JSFunction (see
+    // comments in Runtime_NewObject in runtime.cc). In which case the initial
+    // map's instance type would be JS_FUNCTION_TYPE.
     // edi: constructor
     // eax: initial map
     __ CmpInstanceType(eax, JS_FUNCTION_TYPE);
     __ j(equal, &rt_call);
 
     if (count_constructions) {
       Label allocate;
       // Decrease generous allocation count.
       __ mov(ecx, FieldOperand(edi, JSFunction::kSharedFunctionInfoOffset));
-      __ dec_b(FieldOperand(ecx, SharedFunctionInfo::kConstructionCountOffset));
+      __ dec_b(FieldOperand(ecx,
+                            SharedFunctionInfo::kConstructionCountOffset));
       __ j(not_zero, &allocate);
 
       __ push(eax);
       __ push(edi);
 
       __ push(edi);  // constructor
       // The call will replace the stub, so the countdown is only done once.
       __ CallRuntime(Runtime::kFinalizeInstanceSize, 1);
 
       __ pop(edi);
       __ pop(eax);
 
       __ bind(&allocate);
     }
 
     // Now allocate the JSObject on the heap.
     // edi: constructor
     // eax: initial map
     __ movzx_b(edi, FieldOperand(eax, Map::kInstanceSizeOffset));
     __ shl(edi, kPointerSizeLog2);
-    __ AllocateInNewSpace(edi, ebx, edi, no_reg, &rt_call, NO_ALLOCATION_FLAGS);
+    __ AllocateInNewSpace(edi,
+                          ebx,
+                          edi,
+                          no_reg,
+                          &rt_call,
+                          NO_ALLOCATION_FLAGS);
     // Allocated the JSObject, now initialize the fields.
     // eax: initial map
     // ebx: JSObject
     // edi: start of next object
     __ mov(Operand(ebx, JSObject::kMapOffset), eax);
     Factory* factory = masm->isolate()->factory();
     __ mov(ecx, factory->empty_fixed_array());
     __ mov(Operand(ebx, JSObject::kPropertiesOffset), ecx);
     __ mov(Operand(ebx, JSObject::kElementsOffset), ecx);
     // Set extra fields in the newly allocated object.
@@ skipping 10 matching lines @@
       __ lea(ecx, Operand(ebx, JSObject::kHeaderSize));
       __ jmp(&entry);
       __ bind(&loop);
       __ mov(Operand(ecx, 0), edx);
       __ add(Operand(ecx), Immediate(kPointerSize));
       __ bind(&entry);
       __ cmp(ecx, Operand(edi));
       __ j(less, &loop);
     }
 
-    // Add the object tag to make the JSObject real, so that we can continue and
-    // jump into the continuation code at any time from now on. Any failures
-    // need to undo the allocation, so that the heap is in a consistent state
-    // and verifiable.
+    // Add the object tag to make the JSObject real, so that we can continue
+    // and jump into the continuation code at any time from now on. Any
+    // failures need to undo the allocation, so that the heap is in a
+    // consistent state and verifiable.
     // eax: initial map
     // ebx: JSObject
     // edi: start of next object
     __ or_(Operand(ebx), Immediate(kHeapObjectTag));
 
     // Check if a non-empty properties array is needed.
     // Allocate and initialize a FixedArray if it is.
     // eax: initial map
     // ebx: JSObject
     // edi: start of next object
     // Calculate the total number of properties described by the map.
     __ movzx_b(edx, FieldOperand(eax, Map::kUnusedPropertyFieldsOffset));
-    __ movzx_b(ecx, FieldOperand(eax, Map::kPreAllocatedPropertyFieldsOffset));
+    __ movzx_b(ecx,
+               FieldOperand(eax, Map::kPreAllocatedPropertyFieldsOffset));
     __ add(edx, Operand(ecx));
     // Calculate unused properties past the end of the in-object properties.
     __ movzx_b(ecx, FieldOperand(eax, Map::kInObjectPropertiesOffset));
     __ sub(edx, Operand(ecx));
     // Done if no extra properties are to be allocated.
     __ j(zero, &allocated);
     __ Assert(positive, "Property allocation count failed.");
 
     // Scale the number of elements by pointer size and add the header for
     // FixedArrays to the start of the next object calculation from above.
@@ skipping 125 matching lines @@
   __ j(above_equal, &exit);
 
   // Throw away the result of the constructor invocation and use the
   // on-stack receiver as the result.
   __ bind(&use_receiver);
   __ mov(eax, Operand(esp, 0));
 
   // Restore the arguments count and leave the construct frame.
   __ bind(&exit);
   __ mov(ebx, Operand(esp, kPointerSize));  // get arguments count
-  __ LeaveConstructFrame();
+
+  // Leave construct frame.
+}
 
   // Remove caller arguments from the stack and return.
   ASSERT(kSmiTagSize == 1 && kSmiTag == 0);
   __ pop(ecx);
   __ lea(esp, Operand(esp, ebx, times_2, 1 * kPointerSize));  // 1 ~ receiver
   __ push(ecx);
   __ IncrementCounter(masm->isolate()->counters()->constructed_objects(), 1);
   __ ret(0);
 }
 
 
 void Builtins::Generate_JSConstructStubCountdown(MacroAssembler* masm) {
   Generate_JSConstructStubHelper(masm, false, true);
 }
 
 
 void Builtins::Generate_JSConstructStubGeneric(MacroAssembler* masm) {
   Generate_JSConstructStubHelper(masm, false, false);
 }
 
 
 void Builtins::Generate_JSConstructStubApi(MacroAssembler* masm) {
   Generate_JSConstructStubHelper(masm, true, false);
 }
 
 
 static void Generate_JSEntryTrampolineHelper(MacroAssembler* masm,
                                              bool is_construct) {
-  // Clear the context before we push it when entering the JS frame.
+  // Clear the context before we push it when entering the internal frame.
   __ Set(esi, Immediate(0));
 
-  // Enter an internal frame.
-  __ EnterInternalFrame();
+{
+  FrameScope scope(masm, StackFrame::INTERNAL);
 
   // Load the previous frame pointer (ebx) to access C arguments
   __ mov(ebx, Operand(ebp, 0));
 
   // Get the function from the frame and setup the context.
   __ mov(ecx, Operand(ebx, EntryFrameConstants::kFunctionArgOffset));
   __ mov(esi, FieldOperand(ecx, JSFunction::kContextOffset));
 
   // Push the function and the receiver onto the stack.
   __ push(ecx);
   __ push(Operand(ebx, EntryFrameConstants::kReceiverArgOffset));
 
   // Load the number of arguments and setup pointer to the arguments.
   __ mov(eax, Operand(ebx, EntryFrameConstants::kArgcOffset));
   __ mov(ebx, Operand(ebx, EntryFrameConstants::kArgvOffset));
 
   // Copy arguments to the stack in a loop.
   Label loop, entry;
   __ Set(ecx, Immediate(0));
   __ jmp(&entry);
   __ bind(&loop);
   __ mov(edx, Operand(ebx, ecx, times_4, 0));  // push parameter from argv
   __ push(Operand(edx, 0));  // dereference handle
   __ inc(Operand(ecx));
   __ bind(&entry);
   __ cmp(ecx, Operand(eax));
   __ j(not_equal, &loop);
 
   // Get the function from the stack and call it.
-  __ mov(edi, Operand(esp, eax, times_4, +1 * kPointerSize));  // +1 ~ receiver
+  // kPointerSize for the receiver.
+  __ mov(edi, Operand(esp, eax, times_4, kPointerSize));
 
   // Invoke the code.
   if (is_construct) {
     __ call(masm->isolate()->builtins()->JSConstructCall(),
             RelocInfo::CODE_TARGET);
   } else {
     ParameterCount actual(eax);
     __ InvokeFunction(edi, actual, CALL_FUNCTION,
                       NullCallWrapper(), CALL_AS_METHOD);
   }
 
-  // Exit the JS frame. Notice that this also removes the empty
+  // Exit the internal frame. Notice that this also removes the empty.
   // context and the function left on the stack by the code
   // invocation.
-  __ LeaveInternalFrame();
-  __ ret(1 * kPointerSize);  // remove receiver
+}
+  __ ret(kPointerSize);  // Remove receiver.
 }
 
 
 void Builtins::Generate_JSEntryTrampoline(MacroAssembler* masm) {
   Generate_JSEntryTrampolineHelper(masm, false);
 }
 
 
 void Builtins::Generate_JSConstructEntryTrampoline(MacroAssembler* masm) {
   Generate_JSEntryTrampolineHelper(masm, true);
 }
 
 
 void Builtins::Generate_LazyCompile(MacroAssembler* masm) {
-  // Enter an internal frame.
-  __ EnterInternalFrame();
+{
+  FrameScope scope(masm, StackFrame::INTERNAL);
 
   // Push a copy of the function.
   __ push(edi);
   // Push call kind information.
   __ push(ecx);
 
   __ push(edi);  // Function is also the parameter to the runtime call.
   __ CallRuntime(Runtime::kLazyCompile, 1);
 
   // Restore call kind information.
   __ pop(ecx);
   // Restore receiver.
   __ pop(edi);
 
-  // Tear down temporary frame.
-  __ LeaveInternalFrame();
+  // Tear down internal frame.
+}
 
   // Do a tail-call of the compiled function.
   __ lea(eax, FieldOperand(eax, Code::kHeaderSize));
   __ jmp(Operand(eax));
 }
 
 
 void Builtins::Generate_LazyRecompile(MacroAssembler* masm) {
-  // Enter an internal frame.
-  __ EnterInternalFrame();
+{
+  FrameScope scope(masm, StackFrame::INTERNAL);
 
   // Push a copy of the function onto the stack.
   __ push(edi);
   // Push call kind information.
   __ push(ecx);
 
   __ push(edi);  // Function is also the parameter to the runtime call.
   __ CallRuntime(Runtime::kLazyRecompile, 1);
 
   // Restore call kind information.
   __ pop(ecx);
   // Restore receiver.
   __ pop(edi);
 
-  // Tear down temporary frame.
-  __ LeaveInternalFrame();
+  // Tear down internal frame.
+}
 
   // Do a tail-call of the compiled function.
   __ lea(eax, FieldOperand(eax, Code::kHeaderSize));
   __ jmp(Operand(eax));
 }
 
 
 static void Generate_NotifyDeoptimizedHelper(MacroAssembler* masm,
                                              Deoptimizer::BailoutType type) {
-  // Enter an internal frame.
-  __ EnterInternalFrame();
+{
+  FrameScope scope(masm, StackFrame::INTERNAL);
 
   // Pass the function and deoptimization type to the runtime system.
   __ push(Immediate(Smi::FromInt(static_cast<int>(type))));
   __ CallRuntime(Runtime::kNotifyDeoptimized, 1);
 
-  // Tear down temporary frame.
-  __ LeaveInternalFrame();
+  // Tear down internal frame.
+}
 
   // Get the full codegen state from the stack and untag it.
   __ mov(ecx, Operand(esp, 1 * kPointerSize));
   __ SmiUntag(ecx);
 
   // Switch on the state.
   Label not_no_registers, not_tos_eax;
   __ cmp(ecx, FullCodeGenerator::NO_REGISTERS);
   __ j(not_equal, &not_no_registers, Label::kNear);
   __ ret(1 * kPointerSize);  // Remove state.
@@ skipping 20 matching lines @@
 
 
 void Builtins::Generate_NotifyOSR(MacroAssembler* masm) {
   // TODO(kasperl): Do we need to save/restore the XMM registers too?
 
   // For now, we are relying on the fact that Runtime::NotifyOSR
   // doesn't do any garbage collection which allows us to save/restore
   // the registers without worrying about which of them contain
   // pointers. This seems a bit fragile.
   __ pushad();
-  __ EnterInternalFrame();
-  __ CallRuntime(Runtime::kNotifyOSR, 0);
-  __ LeaveInternalFrame();
+  {
+    FrameScope scope(masm, StackFrame::INTERNAL);
+    __ CallRuntime(Runtime::kNotifyOSR, 0);
+  }
   __ popad();
   __ ret(0);
 }
 
 
 void Builtins::Generate_FunctionCall(MacroAssembler* masm) {
   Factory* factory = masm->isolate()->factory();
 
   // 1. Make sure we have at least one argument.
   { Label done;
@@ skipping 44 matching lines @@
     __ cmp(ebx, factory->null_value());
     __ j(equal, &use_global_receiver);
     __ cmp(ebx, factory->undefined_value());
     __ j(equal, &use_global_receiver);
     STATIC_ASSERT(LAST_JS_OBJECT_TYPE + 1 == LAST_TYPE);
     STATIC_ASSERT(LAST_TYPE == JS_FUNCTION_TYPE);
     __ CmpObjectType(ebx, FIRST_JS_OBJECT_TYPE, ecx);
     __ j(above_equal, &shift_arguments);
 
     __ bind(&convert_to_object);
-    __ EnterInternalFrame();  // In order to preserve argument count.
+
+  { // In order to preserve argument count.
+    FrameScope scope(masm, StackFrame::INTERNAL);
     __ SmiTag(eax);
     __ push(eax);
 
     __ push(ebx);
     __ InvokeBuiltin(Builtins::TO_OBJECT, CALL_FUNCTION);
     __ mov(ebx, eax);
 
     __ pop(eax);
     __ SmiUntag(eax);
-    __ LeaveInternalFrame();
+  }
+
     // Restore the function to edi.
     __ mov(edi, Operand(esp, eax, times_4, 1 * kPointerSize));
     __ jmp(&patch_receiver);
 
     // Use the global receiver object from the called function as the
     // receiver.
     __ bind(&use_global_receiver);
     const int kGlobalIndex =
         Context::kHeaderSize + Context::GLOBAL_INDEX * kPointerSize;
     __ mov(ebx, FieldOperand(esi, kGlobalIndex));
@@ skipping 56 matching lines @@
   __ j(not_equal,
        masm->isolate()->builtins()->ArgumentsAdaptorTrampoline());
 
   ParameterCount expected(0);
   __ InvokeCode(Operand(edx), expected, expected, JUMP_FUNCTION,
                 NullCallWrapper(), CALL_AS_METHOD);
 }
 
 
 void Builtins::Generate_FunctionApply(MacroAssembler* masm) {
-  __ EnterInternalFrame();
+{
+  FrameScope scope(masm, StackFrame::INTERNAL);
 
   __ push(Operand(ebp, 4 * kPointerSize));  // push this
   __ push(Operand(ebp, 2 * kPointerSize));  // push arguments
   __ InvokeBuiltin(Builtins::APPLY_PREPARE, CALL_FUNCTION);
 
   // Check the stack for overflow. We are not trying need to catch
   // interruptions (e.g. debug break and preemption) here, so the "real stack
   // limit" is checked.
   Label okay;
   ExternalReference real_stack_limit =
@@ skipping 107 matching lines @@
   __ cmp(eax, Operand(ebp, kLimitOffset));
   __ j(not_equal, &loop);
 
   // Invoke the function.
   ParameterCount actual(eax);
   __ SmiUntag(eax);
   __ mov(edi, Operand(ebp, 4 * kPointerSize));
   __ InvokeFunction(edi, actual, CALL_FUNCTION,
                     NullCallWrapper(), CALL_AS_METHOD);
 
-  __ LeaveInternalFrame();
+  // Leave the internal frame.
+}
   __ ret(3 * kPointerSize);  // remove this, receiver, and arguments
 }
 
 
 // Number of empty elements to allocate for an empty array.
 static const int kPreallocatedArrayElements = 4;
 
 
 // Allocate an empty JSArray. The allocated array is put into the result
 // register. If the parameter initial_capacity is larger than zero an elements
@@ skipping 531 matching lines @@
   __ j(zero, &convert_argument);
   Condition is_string = masm->IsObjectStringType(eax, ebx, ecx);
   __ j(NegateCondition(is_string), &convert_argument);
   __ mov(ebx, eax);
   __ IncrementCounter(counters->string_ctor_string_value(), 1);
   __ jmp(&argument_is_string);
 
   // Invoke the conversion builtin and put the result into ebx.
   __ bind(&convert_argument);
   __ IncrementCounter(counters->string_ctor_conversions(), 1);
-  __ EnterInternalFrame();
+{
+  FrameScope scope(masm, StackFrame::INTERNAL);
   __ push(edi);  // Preserve the function.
   __ push(eax);
   __ InvokeBuiltin(Builtins::TO_STRING, CALL_FUNCTION);
   __ pop(edi);
-  __ LeaveInternalFrame();
+}
   __ mov(ebx, eax);
   __ jmp(&argument_is_string);
 
   // Load the empty string into ebx, remove the receiver from the
   // stack, and jump back to the case where the argument is a string.
   __ bind(&no_arguments);
   __ Set(ebx, Immediate(factory->empty_string()));
   __ pop(ecx);
   __ lea(esp, Operand(esp, kPointerSize));
   __ push(ecx);
   __ jmp(&argument_is_string);
 
   // At this point the argument is already a string. Call runtime to
   // create a string wrapper.
   __ bind(&gc_required);
   __ IncrementCounter(counters->string_ctor_gc_required(), 1);
-  __ EnterInternalFrame();
+{
+  FrameScope scope(masm, StackFrame::INTERNAL);
   __ push(ebx);
   __ CallRuntime(Runtime::kNewStringWrapper, 1);
-  __ LeaveInternalFrame();
+}
   __ ret(0);
 }
 
 
 static void EnterArgumentsAdaptorFrame(MacroAssembler* masm) {
   __ push(ebp);
   __ mov(ebp, Operand(esp));
 
   // Store the arguments adaptor context sentinel.
   __ push(Immediate(Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR)));
@@ skipping 104 matching lines @@
   // -------------------------------------------
   // Dont adapt arguments.
   // -------------------------------------------
   __ bind(&dont_adapt_arguments);
   __ jmp(Operand(edx));
 }
 
 
 void Builtins::Generate_OnStackReplacement(MacroAssembler* masm) {
   CpuFeatures::TryForceFeatureScope scope(SSE2);
-  if (!CpuFeatures::IsSupported(SSE2)) {
+  if (!CpuFeatures::IsSupported(SSE2) && FLAG_debug_code) {
     __ Abort("Unreachable code: Cannot optimize without SSE2 support.");
     return;
   }
 
   // Get the loop depth of the stack guard check. This is recorded in
   // a test(eax, depth) instruction right after the call.
   Label stack_check;
   __ mov(ebx, Operand(esp, 0));  // return address
   if (FLAG_debug_code) {
     __ cmpb(Operand(ebx, 0), Assembler::kTestAlByte);
     __ Assert(equal, "test eax instruction not found after loop stack check");
   }
   __ movzx_b(ebx, Operand(ebx, 1));  // depth
 
   // Get the loop nesting level at which we allow OSR from the
   // unoptimized code and check if we want to do OSR yet. If not we
   // should perform a stack guard check so we can get interrupts while
   // waiting for on-stack replacement.
   __ mov(eax, Operand(ebp, JavaScriptFrameConstants::kFunctionOffset));
   __ mov(ecx, FieldOperand(eax, JSFunction::kSharedFunctionInfoOffset));
   __ mov(ecx, FieldOperand(ecx, SharedFunctionInfo::kCodeOffset));
   __ cmpb(ebx, FieldOperand(ecx, Code::kAllowOSRAtLoopNestingLevelOffset));
   __ j(greater, &stack_check);
 
   // Pass the function to optimize as the argument to the on-stack
   // replacement runtime function.
-  __ EnterInternalFrame();
+{
+  FrameScope scope(masm, StackFrame::INTERNAL);
   __ push(eax);
   __ CallRuntime(Runtime::kCompileForOnStackReplacement, 1);
-  __ LeaveInternalFrame();
+}
 
   // If the result was -1 it means that we couldn't optimize the
   // function. Just return and continue in the unoptimized version.
   Label skip;
   __ cmp(Operand(eax), Immediate(Smi::FromInt(-1)));
   __ j(not_equal, &skip, Label::kNear);
   __ ret(0);
 
   // If we decide not to perform on-stack replacement we perform a
   // stack guard check to enable interrupts.
   __ bind(&stack_check);
   Label ok;
   ExternalReference stack_limit =
       ExternalReference::address_of_stack_limit(masm->isolate());
   __ cmp(esp, Operand::StaticVariable(stack_limit));
   __ j(above_equal, &ok, Label::kNear);
   StackCheckStub stub;
   __ TailCallStub(&stub);
-  __ Abort("Unreachable code: returned from tail call.");
+  if (FLAG_debug_code) {
+    __ Abort("Unreachable code: returned from tail call.");
+  }
   __ bind(&ok);
   __ ret(0);
 
   __ bind(&skip);
   // Untag the AST id and push it on the stack.
   __ SmiUntag(eax);
   __ push(eax);
 
   // Generate the code for doing the frame-to-frame translation using
   // the deoptimizer infrastructure.
   Deoptimizer::EntryGenerator generator(masm, Deoptimizer::OSR);
   generator.Generate();
 }
 
 
 #undef __
 }
 }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_IA32