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

Side by Side Diff: src/fast-accessor-assembler.cc

Issue 2504913002: Revert of [refactoring] Split CodeAssemblerState out of CodeAssembler (Closed)
Patch Set: Created 4 years, 1 month 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/fast-accessor-assembler.h ('k') | src/ic/keyed-store-generic.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 2015 the V8 project authors. All rights reserved. 1 // Copyright 2015 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/fast-accessor-assembler.h" 5 #include "src/fast-accessor-assembler.h"
6 6
7 #include "src/base/logging.h" 7 #include "src/base/logging.h"
8 #include "src/code-stub-assembler.h" 8 #include "src/code-stub-assembler.h"
9 #include "src/code-stubs.h" // For CallApiCallbackStub. 9 #include "src/code-stubs.h" // For CallApiCallbackStub.
10 #include "src/handles-inl.h" 10 #include "src/handles-inl.h"
11 #include "src/objects.h" // For FAA::LoadInternalField impl. 11 #include "src/objects.h" // For FAA::LoadInternalField impl.
12 12
13 using v8::internal::CodeStubAssembler;
13 using v8::internal::compiler::Node; 14 using v8::internal::compiler::Node;
14 15
15 namespace v8 { 16 namespace v8 {
16 namespace internal { 17 namespace internal {
17 18
18 FastAccessorAssembler::FastAccessorAssembler(Isolate* isolate) 19 FastAccessorAssembler::FastAccessorAssembler(Isolate* isolate)
19 : zone_(isolate->allocator(), ZONE_NAME), 20 : zone_(isolate->allocator(), ZONE_NAME),
20 isolate_(isolate), 21 isolate_(isolate),
21 assembler_state_(isolate, zone(), 1, Code::ComputeFlags(Code::STUB), 22 assembler_(new CodeStubAssembler(isolate, zone(), 1,
22 "FastAccessorAssembler"), 23 Code::ComputeFlags(Code::STUB),
23 assembler_(new CodeStubAssembler(&assembler_state_)), 24 "FastAccessorAssembler")),
24 state_(kBuilding) {} 25 state_(kBuilding) {}
25 26
26 FastAccessorAssembler::~FastAccessorAssembler() { Clear(); } 27 FastAccessorAssembler::~FastAccessorAssembler() { Clear(); }
27 28
28 FastAccessorAssembler::ValueId FastAccessorAssembler::IntegerConstant( 29 FastAccessorAssembler::ValueId FastAccessorAssembler::IntegerConstant(
29 int const_value) { 30 int const_value) {
30 CHECK_EQ(kBuilding, state_); 31 CHECK_EQ(kBuilding, state_);
31 return FromRaw(assembler_->NumberConstant(const_value)); 32 return FromRaw(assembler_->NumberConstant(const_value));
32 } 33 }
33 34
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 Internals::kJSApiObjectType)), 241 Internals::kJSApiObjectType)),
241 FromId(label_id)); 242 FromId(label_id));
242 243
243 // Continue. 244 // Continue.
244 assembler_->Goto(&is_jsobject); 245 assembler_->Goto(&is_jsobject);
245 assembler_->Bind(&is_jsobject); 246 assembler_->Bind(&is_jsobject);
246 } 247 }
247 248
248 MaybeHandle<Code> FastAccessorAssembler::Build() { 249 MaybeHandle<Code> FastAccessorAssembler::Build() {
249 CHECK_EQ(kBuilding, state_); 250 CHECK_EQ(kBuilding, state_);
250 Handle<Code> code = compiler::CodeAssembler::GenerateCode(&assembler_state_); 251 Handle<Code> code = assembler_->GenerateCode();
251 state_ = !code.is_null() ? kBuilt : kError; 252 state_ = !code.is_null() ? kBuilt : kError;
252 Clear(); 253 Clear();
253 return code; 254 return code;
254 } 255 }
255 256
256 FastAccessorAssembler::ValueId FastAccessorAssembler::FromRaw(Node* node) { 257 FastAccessorAssembler::ValueId FastAccessorAssembler::FromRaw(Node* node) {
257 nodes_.push_back(node); 258 nodes_.push_back(node);
258 ValueId value = {nodes_.size() - 1}; 259 ValueId value = {nodes_.size() - 1};
259 return value; 260 return value;
260 } 261 }
(...skipping 20 matching lines...) Expand all
281 void FastAccessorAssembler::Clear() { 282 void FastAccessorAssembler::Clear() {
282 for (auto label : labels_) { 283 for (auto label : labels_) {
283 delete label; 284 delete label;
284 } 285 }
285 nodes_.clear(); 286 nodes_.clear();
286 labels_.clear(); 287 labels_.clear();
287 } 288 }
288 289
289 } // namespace internal 290 } // namespace internal
290 } // namespace v8 291 } // namespace v8
OLDNEW
« no previous file with comments | « src/fast-accessor-assembler.h ('k') | src/ic/keyed-store-generic.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698