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

Side by Side Diff: src/compiler/arm/code-generator-arm.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 | « no previous file | src/compiler/arm64/code-generator-arm64.cc » ('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 2014 the V8 project authors. All rights reserved. 1 // Copyright 2014 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/arm/macro-assembler-arm.h" 7 #include "src/arm/macro-assembler-arm.h"
8 #include "src/compiler/code-generator-impl.h" 8 #include "src/compiler/code-generator-impl.h"
9 #include "src/compiler/gap-resolver.h" 9 #include "src/compiler/gap-resolver.h"
10 #include "src/compiler/node-matchers.h" 10 #include "src/compiler/node-matchers.h"
(...skipping 854 matching lines...) Expand 10 before | Expand all | Expand 10 after
865 if (info()->is_osr()) { 865 if (info()->is_osr()) {
866 // TurboFan OSR-compiled functions cannot be entered directly. 866 // TurboFan OSR-compiled functions cannot be entered directly.
867 __ Abort(kShouldNotDirectlyEnterOsrFunction); 867 __ Abort(kShouldNotDirectlyEnterOsrFunction);
868 868
869 // Unoptimized code jumps directly to this entrypoint while the unoptimized 869 // Unoptimized code jumps directly to this entrypoint while the unoptimized
870 // frame is still on the stack. Optimized code uses OSR values directly from 870 // frame is still on the stack. Optimized code uses OSR values directly from
871 // the unoptimized frame. Thus, all that needs to be done is to allocate the 871 // the unoptimized frame. Thus, all that needs to be done is to allocate the
872 // remaining stack slots. 872 // remaining stack slots.
873 if (FLAG_code_comments) __ RecordComment("-- OSR entrypoint --"); 873 if (FLAG_code_comments) __ RecordComment("-- OSR entrypoint --");
874 osr_pc_offset_ = __ pc_offset(); 874 osr_pc_offset_ = __ pc_offset();
875 // TODO(titzer): cannot address target function == local #-1
876 __ ldr(r1, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset));
875 DCHECK(stack_slots >= frame()->GetOsrStackSlotCount()); 877 DCHECK(stack_slots >= frame()->GetOsrStackSlotCount());
876 stack_slots -= frame()->GetOsrStackSlotCount(); 878 stack_slots -= frame()->GetOsrStackSlotCount();
877 } 879 }
878 880
879 if (stack_slots > 0) { 881 if (stack_slots > 0) {
880 __ sub(sp, sp, Operand(stack_slots * kPointerSize)); 882 __ sub(sp, sp, Operand(stack_slots * kPointerSize));
881 } 883 }
882 } 884 }
883 885
884 886
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
1106 } 1108 }
1107 } 1109 }
1108 MarkLazyDeoptSite(); 1110 MarkLazyDeoptSite();
1109 } 1111 }
1110 1112
1111 #undef __ 1113 #undef __
1112 1114
1113 } // namespace compiler 1115 } // namespace compiler
1114 } // namespace internal 1116 } // namespace internal
1115 } // namespace v8 1117 } // namespace v8
OLDNEW
« no previous file with comments | « no previous file | src/compiler/arm64/code-generator-arm64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698