Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1066)

Side by Side Diff: src/x64/lithium-codegen-x64.cc

Issue 942513002: Put the type feedback vector in the unoptimized JavaScript frame. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: ia32 lithium fix. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 the V8 project authors. All rights reserved. 1 // Copyright 2013 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/v8.h" 5 #include "src/v8.h"
6 6
7 #if V8_TARGET_ARCH_X64 7 #if V8_TARGET_ARCH_X64
8 8
9 #include "src/base/bits.h" 9 #include "src/base/bits.h"
10 #include "src/code-factory.h" 10 #include "src/code-factory.h"
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 // Generate the OSR entry prologue at the first unknown OSR value, or if there 247 // Generate the OSR entry prologue at the first unknown OSR value, or if there
248 // are none, at the OSR entrypoint instruction. 248 // are none, at the OSR entrypoint instruction.
249 if (osr_pc_offset_ >= 0) return; 249 if (osr_pc_offset_ >= 0) return;
250 250
251 osr_pc_offset_ = masm()->pc_offset(); 251 osr_pc_offset_ = masm()->pc_offset();
252 252
253 // Adjust the frame size, subsuming the unoptimized frame into the 253 // Adjust the frame size, subsuming the unoptimized frame into the
254 // optimized frame. 254 // optimized frame.
255 int slots = GetStackSlotCount() - graph()->osr()->UnoptimizedFrameSlots(); 255 int slots = GetStackSlotCount() - graph()->osr()->UnoptimizedFrameSlots();
256 DCHECK(slots >= 0); 256 DCHECK(slots >= 0);
257 __ OSRDropVectorFromStack(graph()->osr()->UnoptimizedFrameSlots(), rbx, rax);
257 __ subp(rsp, Immediate(slots * kPointerSize)); 258 __ subp(rsp, Immediate(slots * kPointerSize));
258 } 259 }
259 260
260 261
261 void LCodeGen::GenerateBodyInstructionPre(LInstruction* instr) { 262 void LCodeGen::GenerateBodyInstructionPre(LInstruction* instr) {
262 if (instr->IsCall()) { 263 if (instr->IsCall()) {
263 EnsureSpaceForLazyDeopt(Deoptimizer::patch_size()); 264 EnsureSpaceForLazyDeopt(Deoptimizer::patch_size());
264 } 265 }
265 if (!instr->IsLazyBailout() && !instr->IsGap()) { 266 if (!instr->IsLazyBailout() && !instr->IsGap()) {
266 safepoints_.BumpLastLazySafepointIndex(); 267 safepoints_.BumpLastLazySafepointIndex();
(...skipping 5664 matching lines...) Expand 10 before | Expand all | Expand 10 after
5931 CallRuntime(Runtime::kPushBlockContext, 2, instr); 5932 CallRuntime(Runtime::kPushBlockContext, 2, instr);
5932 RecordSafepoint(Safepoint::kNoLazyDeopt); 5933 RecordSafepoint(Safepoint::kNoLazyDeopt);
5933 } 5934 }
5934 5935
5935 5936
5936 #undef __ 5937 #undef __
5937 5938
5938 } } // namespace v8::internal 5939 } } // namespace v8::internal
5939 5940
5940 #endif // V8_TARGET_ARCH_X64 5941 #endif // V8_TARGET_ARCH_X64
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698