Simplify and fix code aging.

src/ia32/lithium-codegen-ia32.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 122 matching lines @@
       info_->function()->name()->IsEqualTo(CStrVector(FLAG_stop_at))) {
     __ int3();
   }
 #endif
 
   // Strict mode functions and builtins need to replace the receiver
   // with undefined when called as functions (without an explicit
   // receiver object). ecx is zero for method calls and non-zero for
   // function calls.
   if (!info_->is_classic_mode() || info_->is_native()) {
-    Label begin;
-    __ bind(&begin);
     Label ok;
     __ test(ecx, Operand(ecx));
     __ j(zero, &ok, Label::kNear);
     // +1 for return address.
     int receiver_offset = (scope()->num_parameters() + 1) * kPointerSize;
     __ mov(Operand(esp, receiver_offset),
            Immediate(isolate()->factory()->undefined_value()));
     __ bind(&ok);
-    ASSERT(!FLAG_age_code ||
-           (kSizeOfOptimizedStrictModePrologue == ok.pos() - begin.pos()));
   }
 
 
   if (dynamic_frame_alignment_) {
-    Label begin;
-    __ bind(&begin);
     // Move state of dynamic frame alignment into edx.
     __ mov(edx, Immediate(kNoAlignmentPadding));
 
     Label do_not_pad, align_loop;
     STATIC_ASSERT(kDoubleSize == 2 * kPointerSize);
     // Align esp + 4 to a multiple of 2 * kPointerSize.
     __ test(esp, Immediate(kPointerSize));
     __ j(not_zero, &do_not_pad, Label::kNear);
     __ push(Immediate(0));
     __ mov(ebx, esp);
     __ mov(edx, Immediate(kAlignmentPaddingPushed));
     // Copy arguments, receiver, and return address.
     __ mov(ecx, Immediate(scope()->num_parameters() + 2));
 
     __ bind(&align_loop);
     __ mov(eax, Operand(ebx, 1 * kPointerSize));
     __ mov(Operand(ebx, 0), eax);
     __ add(Operand(ebx), Immediate(kPointerSize));
     __ dec(ecx);
     __ j(not_zero, &align_loop, Label::kNear);
     __ mov(Operand(ebx, 0), Immediate(kAlignmentZapValue));
     __ bind(&do_not_pad);
-    ASSERT(!FLAG_age_code ||
-           (kSizeOfOptimizedAlignStackPrologue ==
-            do_not_pad.pos() - begin.pos()));
   }
 
+  info()->set_prologue_offset(masm_->pc_offset());
   __ push(ebp);  // Caller's frame pointer.
   __ mov(ebp, esp);
   __ push(esi);  // Callee's context.
   __ push(edi);  // Callee's JS function.
 
   if (dynamic_frame_alignment_ && FLAG_debug_code) {
     __ test(esp, Immediate(kPointerSize));
     __ Assert(zero, "frame is expected to be aligned");
   }
 
@@ skipping 5422 matching lines @@
                               FixedArray::kHeaderSize - kPointerSize));
   __ bind(&done);
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_IA32