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

Side by Side Diff: src/x87/full-codegen-x87.cc

Issue 1007783002: Remove --harmony-scoping flag. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: CR feedback 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/x64/full-codegen-x64.cc ('k') | test/cctest/compiler/test-run-jsops.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 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 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_X87 7 #if V8_TARGET_ARCH_X87
8 8
9 #include "src/code-factory.h" 9 #include "src/code-factory.h"
10 #include "src/code-stubs.h" 10 #include "src/code-stubs.h"
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 } 181 }
182 182
183 bool function_in_register = true; 183 bool function_in_register = true;
184 184
185 // Possibly allocate a local context. 185 // Possibly allocate a local context.
186 int heap_slots = info->scope()->num_heap_slots() - Context::MIN_CONTEXT_SLOTS; 186 int heap_slots = info->scope()->num_heap_slots() - Context::MIN_CONTEXT_SLOTS;
187 if (heap_slots > 0) { 187 if (heap_slots > 0) {
188 Comment cmnt(masm_, "[ Allocate context"); 188 Comment cmnt(masm_, "[ Allocate context");
189 bool need_write_barrier = true; 189 bool need_write_barrier = true;
190 // Argument to NewContext is the function, which is still in edi. 190 // Argument to NewContext is the function, which is still in edi.
191 if (FLAG_harmony_scoping && info->scope()->is_script_scope()) { 191 if (info->scope()->is_script_scope()) {
192 __ push(edi); 192 __ push(edi);
193 __ Push(info->scope()->GetScopeInfo(info->isolate())); 193 __ Push(info->scope()->GetScopeInfo(info->isolate()));
194 __ CallRuntime(Runtime::kNewScriptContext, 2); 194 __ CallRuntime(Runtime::kNewScriptContext, 2);
195 } else if (heap_slots <= FastNewContextStub::kMaximumSlots) { 195 } else if (heap_slots <= FastNewContextStub::kMaximumSlots) {
196 FastNewContextStub stub(isolate(), heap_slots); 196 FastNewContextStub stub(isolate(), heap_slots);
197 __ CallStub(&stub); 197 __ CallStub(&stub);
198 // Result of FastNewContextStub is always in new space. 198 // Result of FastNewContextStub is always in new space.
199 need_write_barrier = false; 199 need_write_barrier = false;
200 } else { 200 } else {
201 __ push(edi); 201 __ push(edi);
(...skipping 5151 matching lines...) Expand 10 before | Expand all | Expand 10 after
5353 DCHECK_EQ(isolate->builtins()->OsrAfterStackCheck()->entry(), 5353 DCHECK_EQ(isolate->builtins()->OsrAfterStackCheck()->entry(),
5354 Assembler::target_address_at(call_target_address, 5354 Assembler::target_address_at(call_target_address,
5355 unoptimized_code)); 5355 unoptimized_code));
5356 return OSR_AFTER_STACK_CHECK; 5356 return OSR_AFTER_STACK_CHECK;
5357 } 5357 }
5358 5358
5359 5359
5360 } } // namespace v8::internal 5360 } } // namespace v8::internal
5361 5361
5362 #endif // V8_TARGET_ARCH_X87 5362 #endif // V8_TARGET_ARCH_X87
OLDNEW
« no previous file with comments | « src/x64/full-codegen-x64.cc ('k') | test/cctest/compiler/test-run-jsops.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698