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

Side by Side Diff: src/compiler/ia32/code-generator-ia32.cc

Issue 1026023004: [turbofan] Fix loading of JSFunction from activation in case of adapter frame. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « src/compiler/arm64/code-generator-arm64.cc ('k') | src/compiler/linkage-impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/compiler/code-generator.h" 5 #include "src/compiler/code-generator.h"
6 6
7 #include "src/compiler/code-generator-impl.h" 7 #include "src/compiler/code-generator-impl.h"
8 #include "src/compiler/gap-resolver.h" 8 #include "src/compiler/gap-resolver.h"
9 #include "src/compiler/node-matchers.h" 9 #include "src/compiler/node-matchers.h"
10 #include "src/ia32/assembler-ia32.h" 10 #include "src/ia32/assembler-ia32.h"
(...skipping 1073 matching lines...) Expand 10 before | Expand all | Expand 10 after
1084 if (info()->is_osr()) { 1084 if (info()->is_osr()) {
1085 // TurboFan OSR-compiled functions cannot be entered directly. 1085 // TurboFan OSR-compiled functions cannot be entered directly.
1086 __ Abort(kShouldNotDirectlyEnterOsrFunction); 1086 __ Abort(kShouldNotDirectlyEnterOsrFunction);
1087 1087
1088 // Unoptimized code jumps directly to this entrypoint while the unoptimized 1088 // Unoptimized code jumps directly to this entrypoint while the unoptimized
1089 // frame is still on the stack. Optimized code uses OSR values directly from 1089 // frame is still on the stack. Optimized code uses OSR values directly from
1090 // the unoptimized frame. Thus, all that needs to be done is to allocate the 1090 // the unoptimized frame. Thus, all that needs to be done is to allocate the
1091 // remaining stack slots. 1091 // remaining stack slots.
1092 if (FLAG_code_comments) __ RecordComment("-- OSR entrypoint --"); 1092 if (FLAG_code_comments) __ RecordComment("-- OSR entrypoint --");
1093 osr_pc_offset_ = __ pc_offset(); 1093 osr_pc_offset_ = __ pc_offset();
1094 // TODO(titzer): cannot address target function == local #-1
1095 __ mov(edi, Operand(ebp, JavaScriptFrameConstants::kFunctionOffset));
1094 DCHECK(stack_slots >= frame()->GetOsrStackSlotCount()); 1096 DCHECK(stack_slots >= frame()->GetOsrStackSlotCount());
1095 stack_slots -= frame()->GetOsrStackSlotCount(); 1097 stack_slots -= frame()->GetOsrStackSlotCount();
1096 } 1098 }
1097 1099
1098 if (stack_slots > 0) { 1100 if (stack_slots > 0) {
1099 // Allocate the stack slots used by this frame. 1101 // Allocate the stack slots used by this frame.
1100 __ sub(esp, Immediate(stack_slots * kPointerSize)); 1102 __ sub(esp, Immediate(stack_slots * kPointerSize));
1101 } 1103 }
1102 } 1104 }
1103 1105
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
1330 } 1332 }
1331 } 1333 }
1332 MarkLazyDeoptSite(); 1334 MarkLazyDeoptSite();
1333 } 1335 }
1334 1336
1335 #undef __ 1337 #undef __
1336 1338
1337 } // namespace compiler 1339 } // namespace compiler
1338 } // namespace internal 1340 } // namespace internal
1339 } // namespace v8 1341 } // namespace v8
OLDNEW
« no previous file with comments | « src/compiler/arm64/code-generator-arm64.cc ('k') | src/compiler/linkage-impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698