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

Unified Diff: src/code-stubs.h

Issue 2062343002: [ic] Remove --new-load-global-ic switch. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@enable-load-global-ic
Patch Set: Rebasing Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/code-stubs.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/code-stubs.h
diff --git a/src/code-stubs.h b/src/code-stubs.h
index a043bc32ba7fe2427d9cafe4ab768c83fa2defd8..d2aea4fa39862274a18047c5aab4ad4ef05be0cd 100644
--- a/src/code-stubs.h
+++ b/src/code-stubs.h
@@ -2359,24 +2359,24 @@ class LoadICTrampolineTFStub : public TurboFanCodeStub {
DEFINE_CODE_STUB(LoadICTrampolineTF, TurboFanCodeStub);
};
-class LoadGlobalICTrampolineStub : public LoadICTrampolineTFStub {
+class LoadGlobalICTrampolineStub : public TurboFanCodeStub {
public:
explicit LoadGlobalICTrampolineStub(Isolate* isolate,
const LoadICState& state)
- : LoadICTrampolineTFStub(isolate, state) {}
+ : TurboFanCodeStub(isolate) {
+ minor_key_ = state.GetExtraICState();
+ }
void GenerateAssembly(CodeStubAssembler* assembler) const override;
Code::Kind GetCodeKind() const override { return Code::LOAD_GLOBAL_IC; }
- // DEFINE_CALL_INTERFACE_DESCRIPTOR(LoadGlobal);
- CallInterfaceDescriptor GetCallInterfaceDescriptor() const override {
- if (!FLAG_new_load_global_ic) {
- return LoadICTrampolineTFStub::GetCallInterfaceDescriptor();
- }
- return LoadGlobalDescriptor(isolate());
+ ExtraICState GetExtraICState() const final {
+ return static_cast<ExtraICState>(minor_key_);
}
- DEFINE_CODE_STUB(LoadGlobalICTrampoline, LoadICTrampolineTFStub);
+
+ DEFINE_CALL_INTERFACE_DESCRIPTOR(LoadGlobal);
+ DEFINE_CODE_STUB(LoadGlobalICTrampoline, TurboFanCodeStub);
};
class KeyedLoadICTrampolineStub : public LoadICTrampolineStub {
@@ -2490,23 +2490,23 @@ class LoadICTFStub : public TurboFanCodeStub {
DEFINE_CODE_STUB(LoadICTF, TurboFanCodeStub);
};
-class LoadGlobalICStub : public LoadICTFStub {
+class LoadGlobalICStub : public TurboFanCodeStub {
public:
explicit LoadGlobalICStub(Isolate* isolate, const LoadICState& state)
- : LoadICTFStub(isolate, state) {}
+ : TurboFanCodeStub(isolate) {
+ minor_key_ = state.GetExtraICState();
+ }
void GenerateAssembly(CodeStubAssembler* assembler) const override;
Code::Kind GetCodeKind() const override { return Code::LOAD_GLOBAL_IC; }
- // DEFINE_CALL_INTERFACE_DESCRIPTOR(LoadGlobalWithVector);
- CallInterfaceDescriptor GetCallInterfaceDescriptor() const override {
- if (!FLAG_new_load_global_ic) {
- return LoadICTFStub::GetCallInterfaceDescriptor();
- }
- return LoadGlobalWithVectorDescriptor(isolate());
+ ExtraICState GetExtraICState() const final {
+ return static_cast<ExtraICState>(minor_key_);
}
- DEFINE_CODE_STUB(LoadGlobalIC, LoadICTFStub);
+
+ DEFINE_CALL_INTERFACE_DESCRIPTOR(LoadGlobalWithVector);
+ DEFINE_CODE_STUB(LoadGlobalIC, TurboFanCodeStub);
};
class KeyedLoadICStub : public PlatformCodeStub {
« no previous file with comments | « no previous file | src/code-stubs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698