Commit 70ea462
committed
[JSC] Rename *ByIdVariant to *ByVariant and *ByKind::Normal to *ByKind::ById
https://bugs.webkit.org/show_bug.cgi?id=226750
Reviewed by Yusuke Suzuki.
Cleanup patch following r278445.
1. {Get, Delete, In}ByStatus (but not `Put`) have had `Id` removed from their names; likewise, remove `Id`
from the names of {Get, Delete, In}ByIdVariant. These are used *before* ByVal has been converted to ById.
2. The {Get, Del, In}ByKind enum classes shouldn't really call ById `Normal` -- let's say `ById` explicitly.
3. Bonus: In DFGBytecodeParser, move some *Status::computeFor calls inside the conditional that uses them.
* CMakeLists.txt:
* JavaScriptCore.xcodeproj/project.pbxproj:
* Sources.txt:
* bytecode/DeleteByStatus.cpp:
(JSC::DeleteByStatus::appendVariant):
(JSC::DeleteByStatus::computeForStubInfoWithoutExitSiteFeedback):
(JSC::DeleteByStatus::visitAggregateImpl):
(JSC::DeleteByStatus::markIfCheap):
* bytecode/DeleteByStatus.h:
* bytecode/DeleteByVariant.cpp: Renamed from Source/JavaScriptCore/bytecode/DeleteByIdVariant.cpp.
(JSC::DeleteByVariant::DeleteByVariant):
(JSC::DeleteByVariant::~DeleteByVariant):
(JSC::DeleteByVariant::operator=):
(JSC::DeleteByVariant::attemptToMerge):
(JSC::DeleteByVariant::writesStructures const):
(JSC::DeleteByVariant::visitAggregateImpl):
(JSC::DeleteByVariant::markIfCheap):
(JSC::DeleteByVariant::dump const):
(JSC::DeleteByVariant::finalize):
(JSC::DeleteByVariant::dumpInContext const):
* bytecode/DeleteByVariant.h: Renamed from Source/JavaScriptCore/bytecode/DeleteByIdVariant.h.
(JSC::DeleteByVariant::overlaps):
* bytecode/GetByStatus.cpp:
(JSC::GetByStatus::appendVariant):
(JSC::GetByStatus::computeFromLLInt):
(JSC::GetByStatus::computeForStubInfoWithoutExitSiteFeedback):
(JSC::GetByStatus::computeFor):
(JSC::GetByStatus::merge):
(JSC::GetByStatus::visitAggregateImpl):
(JSC::GetByStatus::markIfCheap):
(JSC::GetByStatus::finalize):
* bytecode/GetByStatus.h:
* bytecode/GetByVariant.cpp: Renamed from Source/JavaScriptCore/bytecode/GetByIdVariant.cpp.
(JSC::GetByVariant::GetByVariant):
(JSC::GetByVariant::~GetByVariant):
(JSC::GetByVariant::operator=):
(JSC::GetByVariant::canMergeIntrinsicStructures const):
(JSC::GetByVariant::attemptToMerge):
(JSC::GetByVariant::visitAggregateImpl):
(JSC::GetByVariant::markIfCheap):
(JSC::GetByVariant::finalize):
(JSC::GetByVariant::dump const):
(JSC::GetByVariant::dumpInContext const):
* bytecode/GetByVariant.h: Renamed from Source/JavaScriptCore/bytecode/GetByIdVariant.h.
(JSC::GetByVariant::overlaps):
* bytecode/InByStatus.cpp:
(JSC::InByStatus::appendVariant):
(JSC::InByStatus::computeForStubInfoWithoutExitSiteFeedback):
(JSC::InByStatus::merge):
(JSC::InByStatus::markIfCheap):
(JSC::InByStatus::finalize):
* bytecode/InByStatus.h:
* bytecode/InByVariant.cpp: Renamed from Source/JavaScriptCore/bytecode/InByIdVariant.cpp.
(JSC::InByVariant::InByVariant):
(JSC::InByVariant::attemptToMerge):
(JSC::InByVariant::markIfCheap):
(JSC::InByVariant::finalize):
(JSC::InByVariant::dump const):
(JSC::InByVariant::dumpInContext const):
* bytecode/InByVariant.h: Renamed from Source/JavaScriptCore/bytecode/InByIdVariant.h.
(JSC::InByVariant::overlaps):
* bytecode/StructureStubInfo.cpp:
(JSC::StructureStubInfo::reset):
* dfg/DFGAbstractInterpreterInlines.h:
(JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::handleIntrinsicGetter):
(JSC::DFG::ByteCodeParser::handleDOMJITGetter):
(JSC::DFG::ByteCodeParser::handleGetById):
(JSC::DFG::ByteCodeParser::handleGetPrivateNameById):
(JSC::DFG::ByteCodeParser::handleDeleteById):
(JSC::DFG::ByteCodeParser::handleInById):
(JSC::DFG::ByteCodeParser::parseBlock):
* dfg/DFGConstantFoldingPhase.cpp:
(JSC::DFG::ConstantFoldingPhase::foldConstants):
(JSC::DFG::ConstantFoldingPhase::emitGetByOffset):
(JSC::DFG::ConstantFoldingPhase::emitDeleteByOffset):
* dfg/DFGNode.h:
* dfg/DFGValidate.cpp:
* ftl/FTLLowerDFGToB3.cpp:
(JSC::FTL::DFG::LowerDFGToB3::compileDelBy):
(JSC::FTL::DFG::LowerDFGToB3::compileDeleteById):
(JSC::FTL::DFG::LowerDFGToB3::compileDeleteByVal):
(JSC::FTL::DFG::LowerDFGToB3::compileMultiDeleteByOffset):
(JSC::FTL::DFG::LowerDFGToB3::compileCompareStrictEq):
* jit/JITOperations.cpp:
(JSC::JSC_DEFINE_JIT_OPERATION):
* jit/Repatch.cpp:
(JSC::appropriateOptimizingGetByFunction):
(JSC::appropriateGetByFunction):
(JSC::tryCacheGetBy):
(JSC::repatchDeleteBy):
(JSC::tryCacheInBy):
(JSC::repatchInBy):
(JSC::resetGetBy):
(JSC::resetDelBy):
(JSC::resetInBy):
* jit/Repatch.h:
Canonical link: https://commits.webkit.org/238668@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@278696 268f45cc-cd09-0410-ab3c-d52691b4dbfc1 parent 4aa4144 commit 70ea462Copy full SHA for 70ea462
26 files changed
+347-241Lines changed: 347 additions & 241 deletions
File tree
Expand file treeCollapse file tree
Open diff view settings
Filter options
- Source/JavaScriptCore
- JavaScriptCore.xcodeproj
- bytecode
- dfg
- ftl
- jit
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Source/JavaScriptCore/CMakeLists.txt
Copy file name to clipboardExpand all lines: Source/JavaScriptCore/CMakeLists.txt-2Lines changed: 0 additions & 2 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
548 | 548 | |
549 | 549 | |
550 | 550 | |
551 | | - |
552 | | - |
553 | 551 | |
554 | 552 | |
555 | 553 | |
|
Collapse file
Source/JavaScriptCore/ChangeLog
Copy file name to clipboardExpand all lines: Source/JavaScriptCore/ChangeLog+115Lines changed: 115 additions & 0 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
| 1 | + |
| 2 | + |
| 3 | + |
| 4 | + |
| 5 | + |
| 6 | + |
| 7 | + |
| 8 | + |
| 9 | + |
| 10 | + |
| 11 | + |
| 12 | + |
| 13 | + |
| 14 | + |
| 15 | + |
| 16 | + |
| 17 | + |
| 18 | + |
| 19 | + |
| 20 | + |
| 21 | + |
| 22 | + |
| 23 | + |
| 24 | + |
| 25 | + |
| 26 | + |
| 27 | + |
| 28 | + |
| 29 | + |
| 30 | + |
| 31 | + |
| 32 | + |
| 33 | + |
| 34 | + |
| 35 | + |
| 36 | + |
| 37 | + |
| 38 | + |
| 39 | + |
| 40 | + |
| 41 | + |
| 42 | + |
| 43 | + |
| 44 | + |
| 45 | + |
| 46 | + |
| 47 | + |
| 48 | + |
| 49 | + |
| 50 | + |
| 51 | + |
| 52 | + |
| 53 | + |
| 54 | + |
| 55 | + |
| 56 | + |
| 57 | + |
| 58 | + |
| 59 | + |
| 60 | + |
| 61 | + |
| 62 | + |
| 63 | + |
| 64 | + |
| 65 | + |
| 66 | + |
| 67 | + |
| 68 | + |
| 69 | + |
| 70 | + |
| 71 | + |
| 72 | + |
| 73 | + |
| 74 | + |
| 75 | + |
| 76 | + |
| 77 | + |
| 78 | + |
| 79 | + |
| 80 | + |
| 81 | + |
| 82 | + |
| 83 | + |
| 84 | + |
| 85 | + |
| 86 | + |
| 87 | + |
| 88 | + |
| 89 | + |
| 90 | + |
| 91 | + |
| 92 | + |
| 93 | + |
| 94 | + |
| 95 | + |
| 96 | + |
| 97 | + |
| 98 | + |
| 99 | + |
| 100 | + |
| 101 | + |
| 102 | + |
| 103 | + |
| 104 | + |
| 105 | + |
| 106 | + |
| 107 | + |
| 108 | + |
| 109 | + |
| 110 | + |
| 111 | + |
| 112 | + |
| 113 | + |
| 114 | + |
| 115 | + |
1 | 116 | |
2 | 117 | |
3 | 118 | |
|
Collapse file
Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
Copy file name to clipboardExpand all lines: Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj+18-18Lines changed: 18 additions & 18 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
127 | 127 | |
128 | 128 | |
129 | 129 | |
130 | | - |
| 130 | + |
131 | 131 | |
132 | 132 | |
133 | 133 | |
| ||
1182 | 1182 | |
1183 | 1183 | |
1184 | 1184 | |
1185 | | - |
| 1185 | + |
1186 | 1186 | |
1187 | 1187 | |
1188 | 1188 | |
| ||
1401 | 1401 | |
1402 | 1402 | |
1403 | 1403 | |
1404 | | - |
| 1404 | + |
1405 | 1405 | |
1406 | 1406 | |
1407 | 1407 | |
| ||
2305 | 2305 | |
2306 | 2306 | |
2307 | 2307 | |
2308 | | - |
2309 | | - |
| 2308 | + |
| 2309 | + |
2310 | 2310 | |
2311 | 2311 | |
2312 | 2312 | |
| ||
4062 | 4062 | |
4063 | 4063 | |
4064 | 4064 | |
4065 | | - |
4066 | | - |
| 4065 | + |
| 4066 | + |
4067 | 4067 | |
4068 | 4068 | |
4069 | 4069 | |
| ||
5062 | 5062 | |
5063 | 5063 | |
5064 | 5064 | |
5065 | | - |
5066 | | - |
| 5065 | + |
| 5066 | + |
5067 | 5067 | |
5068 | 5068 | |
5069 | 5069 | |
| ||
8537 | 8537 | |
8538 | 8538 | |
8539 | 8539 | |
8540 | | - |
8541 | | - |
8542 | 8540 | |
8543 | 8541 | |
| 8542 | + |
| 8543 | + |
8544 | 8544 | |
8545 | 8545 | |
8546 | 8546 | |
| ||
8568 | 8568 | |
8569 | 8569 | |
8570 | 8570 | |
8571 | | - |
8572 | | - |
8573 | 8571 | |
8574 | 8572 | |
8575 | 8573 | |
| 8574 | + |
| 8575 | + |
8576 | 8576 | |
8577 | 8577 | |
8578 | 8578 | |
8579 | 8579 | |
8580 | 8580 | |
8581 | 8581 | |
8582 | | - |
8583 | | - |
8584 | 8582 | |
8585 | 8583 | |
| 8584 | + |
| 8585 | + |
8586 | 8586 | |
8587 | 8587 | |
8588 | 8588 | |
| ||
9528 | 9528 | |
9529 | 9529 | |
9530 | 9530 | |
9531 | | - |
9532 | 9531 | |
| 9532 | + |
9533 | 9533 | |
9534 | 9534 | |
9535 | 9535 | |
| ||
9880 | 9880 | |
9881 | 9881 | |
9882 | 9882 | |
9883 | | - |
9884 | 9883 | |
9885 | 9884 | |
| 9885 | + |
9886 | 9886 | |
9887 | 9887 | |
9888 | 9888 | |
| ||
9921 | 9921 | |
9922 | 9922 | |
9923 | 9923 | |
9924 | | - |
9925 | 9924 | |
| 9925 | + |
9926 | 9926 | |
9927 | 9927 | |
9928 | 9928 | |
|
0 commit comments