Skip to content

Commit b003870

Browse files
cdumezcdumez
committed
Update CommaPrinter to take in an ASCIILiteral
https://bugs.webkit.org/show_bug.cgi?id=273014 Reviewed by Keith Miller. Update CommaPrinter to take in an ASCIILiteral instead of a raw pointer. * Source/JavaScriptCore/b3/B3CaseCollection.cpp: (JSC::B3::CaseCollection::dump const): * Source/JavaScriptCore/b3/B3Effects.cpp: (JSC::B3::Effects::dump const): * Source/JavaScriptCore/b3/B3EliminateCommonSubexpressions.cpp: * Source/JavaScriptCore/b3/B3Kind.cpp: (JSC::B3::Kind::dump const): * Source/JavaScriptCore/b3/B3PatchpointValue.cpp: (JSC::B3::PatchpointValue::dumpMeta const): * Source/JavaScriptCore/b3/B3SSACalculator.cpp: (JSC::B3::SSACalculator::Variable::dumpVerbose const): (JSC::B3::SSACalculator::dump const): * Source/JavaScriptCore/b3/B3Value.cpp: (JSC::B3::Value::deepDump const): * Source/JavaScriptCore/b3/air/AirKind.cpp: (JSC::B3::Air::Kind::dump const): * Source/JavaScriptCore/b3/air/AirUseCounts.h: (JSC::B3::Air::UseCounts::dump const): * Source/JavaScriptCore/bytecode/AccessCase.cpp: (JSC::AccessCase::dump const): * Source/JavaScriptCore/bytecode/ArrayProfile.cpp: (JSC::dumpArrayModes): (JSC::ArrayProfile::briefDescriptionWithoutUpdating): * Source/JavaScriptCore/bytecode/CallLinkStatus.cpp: (JSC::CallLinkStatus::dump const): * Source/JavaScriptCore/bytecode/ExitFlag.cpp: (JSC::ExitFlag::dump const): * Source/JavaScriptCore/bytecode/InlineCacheCompiler.cpp: (JSC::PolymorphicAccess::dump const): * Source/JavaScriptCore/bytecode/OperandsInlines.h: (JSC::U>::dumpInContext const): (JSC::U>::dump const): * Source/JavaScriptCore/bytecode/PutByIdFlags.cpp: (WTF::printInternal): * Source/JavaScriptCore/bytecode/SpeculatedType.cpp: (JSC::PrettyPrinter::PrettyPrinter): * Source/JavaScriptCore/bytecode/StructureSet.cpp: (JSC::StructureSet::dumpInContext const): * Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h: (JSC::DFG::AbstractInterpreter<AbstractStateType>::dump): * Source/JavaScriptCore/dfg/DFGBlockSet.cpp: (JSC::DFG::BlockSet::dump const): * Source/JavaScriptCore/dfg/DFGFlowMap.h: (WTF::printInternal): * Source/JavaScriptCore/dfg/DFGGraph.cpp: (JSC::DFG::Graph::dump): * Source/JavaScriptCore/dfg/DFGNode.h: (JSC::DFG::nodeMapDump): (JSC::DFG::nodeValuePairListDump): * Source/JavaScriptCore/dfg/DFGNodeFlags.cpp: (JSC::DFG::dumpNodeFlags): * Source/JavaScriptCore/dfg/DFGOSREntry.cpp: (JSC::DFG::OSREntryData::dumpInContext const): * Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp: * Source/JavaScriptCore/dfg/DFGPureValue.cpp: (JSC::DFG::PureValue::dump const): * Source/JavaScriptCore/dfg/DFGSSACalculator.cpp: (JSC::DFG::SSACalculator::Variable::dumpVerbose const): (JSC::DFG::SSACalculator::dump const): * Source/JavaScriptCore/heap/CodeBlockSet.cpp: (JSC::CodeBlockSet::dump const): * Source/JavaScriptCore/heap/Heap.cpp: (JSC::Heap::runFixpointPhase): * Source/JavaScriptCore/heap/MarkedBlock.cpp: (JSC::MarkedBlock::Handle::dumpState): * Source/JavaScriptCore/interpreter/ShadowChicken.cpp: (JSC::ShadowChicken::dump const): * Source/JavaScriptCore/jit/RegisterSet.h: * Source/JavaScriptCore/jsc.cpp: (main): * Source/JavaScriptCore/parser/VariableEnvironment.cpp: (JSC::VariableEnvironment::dump const): * Source/JavaScriptCore/runtime/ExecutableBase.cpp: (JSC::ExecutableBase::dump const): * Source/JavaScriptCore/runtime/Structure.cpp: (JSC::Structure::dump const): * Source/JavaScriptCore/runtime/SymbolTable.cpp: (JSC::SymbolTable::dump const): * Source/JavaScriptCore/wasm/WasmLLIntGenerator.cpp: (JSC::Wasm::LLIntGenerator::dump): * Source/JavaScriptCore/wasm/WasmOMGIRGenerator.cpp: (JSC::Wasm::OMGIRGenerator::dump): * Source/JavaScriptCore/wasm/WasmTypeDefinition.cpp: (JSC::Wasm::FunctionSignature::dump const): (JSC::Wasm::StructType::dump const): (JSC::Wasm::ArrayType::dump const): (JSC::Wasm::RecursionGroup::dump const): (JSC::Wasm::Projection::dump const): (JSC::Wasm::Subtype::dump const): * Source/WTF/wtf/BackwardsGraph.h: (WTF::BackwardsGraph::dump const): * Source/WTF/wtf/CommaPrinter.h: * Source/WTF/wtf/Dominators.h: (WTF::Dominators::dump const): * Source/WTF/wtf/JSONValues.cpp: (WTF::JSONImpl::Value::dump const): * Source/WTF/wtf/ListDump.h: (WTF::ListDump::ListDump): (WTF::PointerListDump::PointerListDump): (WTF::MapDump::MapDump): (WTF::listDump): (WTF::pointerListDump): (WTF::sortedListDump): (WTF::mapDump): (WTF::sortedMapDump): (WTF::ListDumpInContext::ListDumpInContext): (WTF::listDumpInContext): * Source/WTF/wtf/NaturalLoops.h: (WTF::NaturalLoops::dump const): * Source/WTF/wtf/SingleRootGraph.h: (WTF::SingleRootGraph::dump const): Canonical link: https://commits.webkit.org/277774@main
1 parent 23f72b4 commit b003870

48 files changed

Lines changed: 325 additions & 325 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Source/JavaScriptCore/b3/B3CaseCollection.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ void CaseCollection::dump(PrintStream& out) const
3939
CommaPrinter comma;
4040
for (SwitchCase switchCase : *this)
4141
out.print(comma, switchCase);
42-
out.print(comma, "default->", fallThrough());
42+
out.print(comma, "default->"_s, fallThrough());
4343
}
4444

4545
} } // namespace JSC::B3

‎Source/JavaScriptCore/b3/B3Effects.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -87,27 +87,27 @@ bool Effects::interferes(const Effects& other) const
8787

8888
void Effects::dump(PrintStream& out) const
8989
{
90-
CommaPrinter comma("|");
90+
CommaPrinter comma("|"_s);
9191
if (terminal)
92-
out.print(comma, "Terminal");
92+
out.print(comma, "Terminal"_s);
9393
if (exitsSideways)
94-
out.print(comma, "ExitsSideways");
94+
out.print(comma, "ExitsSideways"_s);
9595
if (controlDependent)
96-
out.print(comma, "ControlDependent");
96+
out.print(comma, "ControlDependent"_s);
9797
if (writesLocalState)
98-
out.print(comma, "WritesLocalState");
98+
out.print(comma, "WritesLocalState"_s);
9999
if (readsLocalState)
100-
out.print(comma, "ReadsLocalState");
100+
out.print(comma, "ReadsLocalState"_s);
101101
if (writesPinned)
102-
out.print(comma, "WritesPinned");
102+
out.print(comma, "WritesPinned"_s);
103103
if (readsPinned)
104-
out.print(comma, "ReadsPinned");
104+
out.print(comma, "ReadsPinned"_s);
105105
if (fence)
106-
out.print(comma, "Fence");
106+
out.print(comma, "Fence"_s);
107107
if (writes)
108-
out.print(comma, "Writes:", writes);
108+
out.print(comma, "Writes:"_s, writes);
109109
if (reads)
110-
out.print(comma, "Reads:", reads);
110+
out.print(comma, "Reads:"_s, reads);
111111
}
112112

113113
} } // namespace JSC::B3

‎Source/JavaScriptCore/b3/B3EliminateCommonSubexpressions.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,11 @@ class MemoryValueMap {
121121

122122
void dump(PrintStream& out) const
123123
{
124-
out.print("{");
124+
out.print("{"_s);
125125
CommaPrinter comma;
126126
for (auto& entry : m_map)
127-
out.print(comma, pointerDump(entry.key), "=>", pointerListDump(entry.value));
128-
out.print("}");
127+
out.print(comma, pointerDump(entry.key), "=>"_s, pointerListDump(entry.value));
128+
out.print("}"_s);
129129
}
130130

131131
private:

‎Source/JavaScriptCore/b3/B3Kind.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ void Kind::dump(PrintStream& out) const
3636
{
3737
out.print(m_opcode);
3838

39-
CommaPrinter comma(", ", "<");
39+
CommaPrinter comma(", "_s, "<"_s);
4040
if (isChill())
41-
out.print(comma, "Chill");
41+
out.print(comma, "Chill"_s);
4242
if (traps())
43-
out.print(comma, "Traps");
43+
out.print(comma, "Traps"_s);
4444
if (isSensitiveToNaN())
45-
out.print(comma, "SensitiveToNaN");
45+
out.print(comma, "SensitiveToNaN"_s);
4646
if (isCloningForbidden())
47-
out.print(comma, "CloningForbidden");
47+
out.print(comma, "CloningForbidden"_s);
4848
if (comma.didPrint())
49-
out.print(">");
49+
out.print(">"_s);
5050
}
5151

5252
} } // namespace JSC::B3

‎Source/JavaScriptCore/b3/B3PatchpointValue.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,18 @@ PatchpointValue::~PatchpointValue()
3737
void PatchpointValue::dumpMeta(CommaPrinter& comma, PrintStream& out) const
3838
{
3939
Base::dumpMeta(comma, out);
40-
out.print(comma, "resultConstraints = ");
41-
out.print(resultConstraints.size() > 1 ? "[" : "");
40+
out.print(comma, "resultConstraints = "_s);
41+
out.print(resultConstraints.size() > 1 ? "["_s : ""_s);
4242

4343
CommaPrinter constraintComma;
4444
for (const auto& constraint : resultConstraints)
4545
out.print(constraintComma, constraint);
46-
out.print(resultConstraints.size() > 1 ? "]" : "");
46+
out.print(resultConstraints.size() > 1 ? "]"_s : ""_s);
4747

4848
if (numGPScratchRegisters)
49-
out.print(comma, "numGPScratchRegisters = ", numGPScratchRegisters);
49+
out.print(comma, "numGPScratchRegisters = "_s, numGPScratchRegisters);
5050
if (numFPScratchRegisters)
51-
out.print(comma, "numFPScratchRegisters = ", numFPScratchRegisters);
51+
out.print(comma, "numFPScratchRegisters = "_s, numFPScratchRegisters);
5252
}
5353

5454
PatchpointValue::PatchpointValue(Type type, Origin origin, Kind kind)

‎Source/JavaScriptCore/b3/B3SSACalculator.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ void SSACalculator::Variable::dumpVerbose(PrintStream& out) const
4141
{
4242
dump(out);
4343
if (!m_blocksWithDefs.isEmpty()) {
44-
out.print("(defs: ");
44+
out.print("(defs: "_s);
4545
CommaPrinter comma;
4646
for (BasicBlock* block : m_blocksWithDefs)
4747
out.print(comma, *block);
48-
out.print(")");
48+
out.print(")"_s);
4949
}
5050
}
5151

@@ -110,39 +110,39 @@ SSACalculator::Def* SSACalculator::reachingDefAtTail(BasicBlock* startingBlock,
110110

111111
void SSACalculator::dump(PrintStream& out) const
112112
{
113-
out.print("<Variables: [");
113+
out.print("<Variables: ["_s);
114114
CommaPrinter comma;
115115
for (unsigned i = 0; i < m_variables.size(); ++i) {
116116
out.print(comma);
117117
m_variables[i].dumpVerbose(out);
118118
}
119-
out.print("], Defs: [");
119+
out.print("], Defs: ["_s);
120120
comma = CommaPrinter();
121121
for (Def* def : const_cast<SSACalculator*>(this)->m_defs)
122122
out.print(comma, *def);
123-
out.print("], Phis: [");
123+
out.print("], Phis: ["_s);
124124
comma = CommaPrinter();
125125
for (Def* def : const_cast<SSACalculator*>(this)->m_phis)
126126
out.print(comma, *def);
127-
out.print("], Block data: [");
127+
out.print("], Block data: ["_s);
128128
comma = CommaPrinter();
129129
for (unsigned blockIndex = 0; blockIndex < m_proc.size(); ++blockIndex) {
130130
BasicBlock* block = m_proc[blockIndex];
131131
if (!block)
132132
continue;
133133

134-
out.print(comma, *block, "=>(");
135-
out.print("Defs: {");
134+
out.print(comma, *block, "=>("_s);
135+
out.print("Defs: {"_s);
136136
CommaPrinter innerComma;
137137
for (auto entry : m_data[block].m_defs)
138-
out.print(innerComma, *entry.key, "->", *entry.value);
139-
out.print("}, Phis: {");
138+
out.print(innerComma, *entry.key, "->"_s, *entry.value);
139+
out.print("}, Phis: {"_s);
140140
innerComma = CommaPrinter();
141141
for (Def* def : m_data[block].m_phis)
142142
out.print(innerComma, *def);
143-
out.print("})");
143+
out.print("})"_s);
144144
}
145-
out.print("]>");
145+
out.print("]>"_s);
146146
}
147147

148148
} } // namespace JSC::B3

‎Source/JavaScriptCore/b3/B3Value.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,9 @@ void Value::dumpChildren(CommaPrinter& comma, PrintStream& out) const
258258

259259
void Value::deepDump(const Procedure* proc, PrintStream& out) const
260260
{
261-
out.print(m_type, " ", dumpPrefix, m_index, " = ", m_kind);
261+
out.print(m_type, " "_s, dumpPrefix, m_index, " = "_s, m_kind);
262262

263-
out.print("(");
263+
out.print("("_s);
264264
CommaPrinter comma;
265265
dumpChildren(comma, out);
266266

@@ -282,7 +282,7 @@ void Value::deepDump(const Procedure* proc, PrintStream& out) const
282282
}
283283
#endif
284284

285-
out.print(")");
285+
out.print(")"_s);
286286
}
287287

288288
void Value::dumpSuccessors(const BasicBlock* block, PrintStream& out) const

‎Source/JavaScriptCore/b3/air/AirKind.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ void Kind::dump(PrintStream& out) const
3636
{
3737
out.print(opcode);
3838

39-
CommaPrinter comma(", ", "<");
39+
CommaPrinter comma(", "_s, "<"_s);
4040
if (effects)
4141
out.print(comma, "Effects");
4242
if (comma.didPrint())
43-
out.print(">");
43+
out.print(">"_s);
4444
}
4545

4646
} } } // namespace JSC::B3::Air

‎Source/JavaScriptCore/b3/air/AirUseCounts.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,11 @@ class UseCounts {
109109

110110
void dump(PrintStream& out) const
111111
{
112-
CommaPrinter comma(", ");
112+
CommaPrinter comma(", "_s);
113113
for (unsigned i = 0; i < m_gpNumWarmUsesAndDefs.size(); ++i)
114-
out.print(comma, AbsoluteTmpMapper<GP>::tmpFromAbsoluteIndex(i), "=> {numWarmUsesAndDefs=", m_gpNumWarmUsesAndDefs[i], ", isConstDef=", m_gpConstDefs.quickGet(i), "}");
114+
out.print(comma, AbsoluteTmpMapper<GP>::tmpFromAbsoluteIndex(i), "=> {numWarmUsesAndDefs="_s, m_gpNumWarmUsesAndDefs[i], ", isConstDef="_s, m_gpConstDefs.quickGet(i), "}"_s);
115115
for (unsigned i = 0; i < m_fpNumWarmUsesAndDefs.size(); ++i)
116-
out.print(comma, AbsoluteTmpMapper<FP>::tmpFromAbsoluteIndex(i), "=> {numWarmUsesAndDefs=", m_fpNumWarmUsesAndDefs[i], ", isConstDef=", m_fpConstDefs.quickGet(i), "}");
116+
out.print(comma, AbsoluteTmpMapper<FP>::tmpFromAbsoluteIndex(i), "=> {numWarmUsesAndDefs="_s, m_fpNumWarmUsesAndDefs[i], ", isConstDef="_s, m_fpConstDefs.quickGet(i), "}"_s);
117117
}
118118

119119
private:

‎Source/JavaScriptCore/bytecode/AccessCase.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1208,38 +1208,38 @@ bool AccessCase::canReplace(const AccessCase& other) const
12081208

12091209
void AccessCase::dump(PrintStream& out) const
12101210
{
1211-
out.print("\n", m_type, ": {");
1211+
out.print("\n"_s, m_type, ": {"_s);
12121212

12131213
Indenter indent;
12141214
CommaPrinter comma;
12151215

12161216
out.print(comma, m_state);
12171217

1218-
out.print(comma, "ident = '", m_identifier, "'");
1218+
out.print(comma, "ident = '"_s, m_identifier, "'"_s);
12191219
if (isValidOffset(m_offset))
1220-
out.print(comma, "offset = ", m_offset);
1220+
out.print(comma, "offset = "_s, m_offset);
12211221

12221222
++indent;
12231223

12241224
if (m_polyProtoAccessChain) {
1225-
out.print("\n", indent, "prototype access chain = ");
1225+
out.print("\n"_s, indent, "prototype access chain = "_s);
12261226
m_polyProtoAccessChain->dump(structure(), out);
12271227
} else {
12281228
if (m_type == Transition || m_type == Delete || m_type == SetPrivateBrand)
1229-
out.print("\n", indent, "from structure = ", pointerDump(structure()),
1230-
"\n", indent, "to structure = ", pointerDump(newStructure()));
1229+
out.print("\n"_s, indent, "from structure = "_s, pointerDump(structure()),
1230+
"\n"_s, indent, "to structure = "_s, pointerDump(newStructure()));
12311231
else if (m_structureID)
1232-
out.print("\n", indent, "structure = ", pointerDump(m_structureID.get()));
1232+
out.print("\n"_s, indent, "structure = "_s, pointerDump(m_structureID.get()));
12331233
}
12341234

12351235
if (!m_conditionSet.isEmpty())
1236-
out.print("\n", indent, "conditions = ", m_conditionSet);
1236+
out.print("\n"_s, indent, "conditions = "_s, m_conditionSet);
12371237

12381238
const_cast<AccessCase*>(this)->runWithDowncast([&](auto* accessCase) {
12391239
accessCase->dumpImpl(out, comma, indent);
12401240
});
12411241

1242-
out.print("}");
1242+
out.print("}"_s);
12431243
}
12441244

12451245
bool AccessCase::visitWeak(VM& vm) const

0 commit comments

Comments
 (0)