Skip to content

Commit 92cc73a

Browse files
author
Basile Clement
committed
Get rid of FTLValueFormat
https://bugs.webkit.org/show_bug.cgi?id=148448 Reviewed by Michael Saboff. FTL::ValueFormat is nothing more than DataFormat (and is actually slightly less). Let's get rid of it. * CMakeLists.txt: * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj: * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters: * JavaScriptCore.xcodeproj/project.pbxproj: * bytecode/DataFormat.cpp: Renamed from Source/JavaScriptCore/ftl/FTLValueFormat.h. (WTF::printInternal): * bytecode/DataFormat.h: * ftl/FTLAvailableRecovery.h: (JSC::FTL::AvailableRecovery::AvailableRecovery): (JSC::FTL::AvailableRecovery::format): * ftl/FTLExitArgument.h: (JSC::FTL::ExitArgument::ExitArgument): (JSC::FTL::ExitArgument::operator!): (JSC::FTL::ExitArgument::format): (JSC::FTL::ExitArgument::withFormat): * ftl/FTLExitValue.cpp: (JSC::FTL::ExitValue::dataFormat): * ftl/FTLExitValue.h: (JSC::FTL::ExitValue::recovery): (JSC::FTL::ExitValue::recoveryFormat): * ftl/FTLFormattedValue.h: (JSC::FTL::FormattedValue::FormattedValue): (JSC::FTL::FormattedValue::operator!): (JSC::FTL::FormattedValue::format): (JSC::FTL::int32Value): (JSC::FTL::booleanValue): (JSC::FTL::jsValueValue): (JSC::FTL::doubleValue): * ftl/FTLLowerDFGToLLVM.cpp: (JSC::FTL::DFG::LowerDFGToLLVM::compileArithAddOrSub): (JSC::FTL::DFG::LowerDFGToLLVM::compileInvalidationPoint): (JSC::FTL::DFG::LowerDFGToLLVM::convertDoubleToInt32): (JSC::FTL::DFG::LowerDFGToLLVM::exitValueForNode): (JSC::FTL::DFG::LowerDFGToLLVM::exitArgument): (JSC::FTL::DFG::LowerDFGToLLVM::addAvailableRecovery): * ftl/FTLOSRExit.cpp: (JSC::FTL::OSRExit::OSRExit): * ftl/FTLOSRExit.h: * ftl/FTLOSRExitCompiler.cpp: (JSC::FTL::reboxAccordingToFormat): (JSC::FTL::compileRecovery): (JSC::FTL::compileStub): * ftl/FTLValueFormat.cpp: Removed. Canonical link: https://commits.webkit.org/166916@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@189362 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 9660d48 commit 92cc73a

17 files changed

Lines changed: 194 additions & 243 deletions

‎Source/JavaScriptCore/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ set(JavaScriptCore_SOURCES
8787
bytecode/CodeOrigin.cpp
8888
bytecode/CodeType.cpp
8989
bytecode/ComplexGetStatus.cpp
90+
bytecode/DataFormat.cpp
9091
bytecode/DFGExitProfile.cpp
9192
bytecode/DeferredCompilationCallback.cpp
9293
bytecode/DeferredSourceDump.cpp
@@ -908,7 +909,6 @@ if (ENABLE_FTL_JIT)
908909
ftl/FTLState.cpp
909910
ftl/FTLThunks.cpp
910911
ftl/FTLUnwindInfo.cpp
911-
ftl/FTLValueFormat.cpp
912912
ftl/FTLValueRange.cpp
913913

914914
llvm/InitializeLLVM.cpp

‎Source/JavaScriptCore/ChangeLog‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,57 @@
1+
2015-08-25 Basile Clement <basile_clement@apple.com>
2+
3+
Get rid of FTLValueFormat
4+
https://bugs.webkit.org/show_bug.cgi?id=148448
5+
6+
Reviewed by Michael Saboff.
7+
8+
FTL::ValueFormat is nothing more than DataFormat (and is actually
9+
slightly less). Let's get rid of it.
10+
11+
* CMakeLists.txt:
12+
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
13+
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
14+
* JavaScriptCore.xcodeproj/project.pbxproj:
15+
* bytecode/DataFormat.cpp: Renamed from Source/JavaScriptCore/ftl/FTLValueFormat.h.
16+
(WTF::printInternal):
17+
* bytecode/DataFormat.h:
18+
* ftl/FTLAvailableRecovery.h:
19+
(JSC::FTL::AvailableRecovery::AvailableRecovery):
20+
(JSC::FTL::AvailableRecovery::format):
21+
* ftl/FTLExitArgument.h:
22+
(JSC::FTL::ExitArgument::ExitArgument):
23+
(JSC::FTL::ExitArgument::operator!):
24+
(JSC::FTL::ExitArgument::format):
25+
(JSC::FTL::ExitArgument::withFormat):
26+
* ftl/FTLExitValue.cpp:
27+
(JSC::FTL::ExitValue::dataFormat):
28+
* ftl/FTLExitValue.h:
29+
(JSC::FTL::ExitValue::recovery):
30+
(JSC::FTL::ExitValue::recoveryFormat):
31+
* ftl/FTLFormattedValue.h:
32+
(JSC::FTL::FormattedValue::FormattedValue):
33+
(JSC::FTL::FormattedValue::operator!):
34+
(JSC::FTL::FormattedValue::format):
35+
(JSC::FTL::int32Value):
36+
(JSC::FTL::booleanValue):
37+
(JSC::FTL::jsValueValue):
38+
(JSC::FTL::doubleValue):
39+
* ftl/FTLLowerDFGToLLVM.cpp:
40+
(JSC::FTL::DFG::LowerDFGToLLVM::compileArithAddOrSub):
41+
(JSC::FTL::DFG::LowerDFGToLLVM::compileInvalidationPoint):
42+
(JSC::FTL::DFG::LowerDFGToLLVM::convertDoubleToInt32):
43+
(JSC::FTL::DFG::LowerDFGToLLVM::exitValueForNode):
44+
(JSC::FTL::DFG::LowerDFGToLLVM::exitArgument):
45+
(JSC::FTL::DFG::LowerDFGToLLVM::addAvailableRecovery):
46+
* ftl/FTLOSRExit.cpp:
47+
(JSC::FTL::OSRExit::OSRExit):
48+
* ftl/FTLOSRExit.h:
49+
* ftl/FTLOSRExitCompiler.cpp:
50+
(JSC::FTL::reboxAccordingToFormat):
51+
(JSC::FTL::compileRecovery):
52+
(JSC::FTL::compileStub):
53+
* ftl/FTLValueFormat.cpp: Removed.
54+
155
2015-09-04 Basile Clement <basile_clement@apple.com>
256

357
Introduce RegisterMap<T>

‎Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@
326326
<ClCompile Include="..\bytecode\CodeOrigin.cpp" />
327327
<ClCompile Include="..\bytecode\CodeType.cpp" />
328328
<ClCompile Include="..\bytecode\ComplexGetStatus.cpp" />
329+
<ClCompile Include="..\bytecode\DataFormat.cpp" />
329330
<ClCompile Include="..\bytecode\DeferredCompilationCallback.cpp" />
330331
<ClCompile Include="..\bytecode\DeferredSourceDump.cpp" />
331332
<ClCompile Include="..\bytecode\DFGExitProfile.cpp" />
@@ -551,7 +552,6 @@
551552
<ClCompile Include="..\ftl\FTLState.cpp" />
552553
<ClCompile Include="..\ftl\FTLThunks.cpp" />
553554
<ClCompile Include="..\ftl\FTLUnwindInfo.cpp" />
554-
<ClCompile Include="..\ftl\FTLValueFormat.cpp" />
555555
<ClCompile Include="..\ftl\FTLValueRange.cpp" />
556556
<ClCompile Include="..\heap\CodeBlockSet.cpp" />
557557
<ClCompile Include="..\heap\ConservativeRoots.cpp" />
@@ -1303,7 +1303,6 @@
13031303
<ClInclude Include="..\ftl\FTLThunks.h" />
13041304
<ClInclude Include="..\ftl\FTLTypedPointer.h" />
13051305
<ClInclude Include="..\ftl\FTLUnwindInfo.h" />
1306-
<ClInclude Include="..\ftl\FTLValueFormat.h" />
13071306
<ClInclude Include="..\ftl\FTLValueFromBlock.h" />
13081307
<ClInclude Include="..\ftl\FTLValueRange.h" />
13091308
<ClInclude Include="..\ftl\FTLWeight.h" />

‎Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,9 @@
174174
<ClCompile Include="..\bytecode\CodeType.cpp">
175175
<Filter>bytecode</Filter>
176176
</ClCompile>
177+
<ClCompile Include="..\bytecode\DataFormat.cpp">
178+
<Filter>bytecode</Filter>
179+
</ClCompile>
177180
<ClCompile Include="..\bytecode\ExecutionCounter.cpp">
178181
<Filter>bytecode</Filter>
179182
</ClCompile>
@@ -1602,9 +1605,6 @@
16021605
<ClCompile Include="..\ftl\FTLUnwindInfo.cpp">
16031606
<Filter>ftl</Filter>
16041607
</ClCompile>
1605-
<ClCompile Include="..\ftl\FTLValueFormat.cpp">
1606-
<Filter>ftl</Filter>
1607-
</ClCompile>
16081608
<ClCompile Include="..\ftl\FTLValueRange.cpp">
16091609
<Filter>ftl</Filter>
16101610
</ClCompile>
@@ -4172,9 +4172,6 @@
41724172
<ClInclude Include="..\ftl\FTLUnwindInfo.h">
41734173
<Filter>ftl</Filter>
41744174
</ClInclude>
4175-
<ClInclude Include="..\ftl\FTLValueFormat.h">
4176-
<Filter>ftl</Filter>
4177-
</ClInclude>
41784175
<ClInclude Include="..\ftl\FTLValueFromBlock.h">
41794176
<Filter>ftl</Filter>
41804177
</ClInclude>

‎Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,6 @@
135135
0F235BE017178E1C00690C7F /* FTLOSRExitCompiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F235BCA17178E1C00690C7F /* FTLOSRExitCompiler.h */; settings = {ATTRIBUTES = (Private, ); }; };
136136
0F235BE117178E1C00690C7F /* FTLThunks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F235BCB17178E1C00690C7F /* FTLThunks.cpp */; };
137137
0F235BE217178E1C00690C7F /* FTLThunks.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F235BCC17178E1C00690C7F /* FTLThunks.h */; settings = {ATTRIBUTES = (Private, ); }; };
138-
0F235BE317178E1C00690C7F /* FTLValueFormat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F235BCD17178E1C00690C7F /* FTLValueFormat.cpp */; };
139-
0F235BE417178E1C00690C7F /* FTLValueFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F235BCE17178E1C00690C7F /* FTLValueFormat.h */; settings = {ATTRIBUTES = (Private, ); }; };
140138
0F235BEB17178E7300690C7F /* DFGOSRExitBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F235BE717178E7300690C7F /* DFGOSRExitBase.cpp */; };
141139
0F235BEC17178E7300690C7F /* DFGOSRExitBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F235BE817178E7300690C7F /* DFGOSRExitBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
142140
0F235BED17178E7300690C7F /* DFGOSRExitPreparation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F235BE917178E7300690C7F /* DFGOSRExitPreparation.cpp */; };
@@ -980,6 +978,7 @@
980978
623A37EC1B87A7C000754209 /* RegisterMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 623A37EB1B87A7BD00754209 /* RegisterMap.h */; };
981979
62D2D38F1ADF103F000206C1 /* FunctionRareData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 62D2D38D1ADF103F000206C1 /* FunctionRareData.cpp */; };
982980
62D2D3901ADF103F000206C1 /* FunctionRareData.h in Headers */ = {isa = PBXBuildFile; fileRef = 62D2D38E1ADF103F000206C1 /* FunctionRareData.h */; settings = {ATTRIBUTES = (Private, ); }; };
981+
62E3D5F01B8D0B7300B868BB /* DataFormat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 62E3D5EF1B8D0B7300B868BB /* DataFormat.cpp */; };
983982
62F2AA371B0BEDE300610C7A /* DFGLazyNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 62A9A29E1B0BED4800BD54CA /* DFGLazyNode.cpp */; };
984983
62F2AA381B0BEDE300610C7A /* DFGLazyNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 62A9A29F1B0BED4800BD54CA /* DFGLazyNode.h */; settings = {ATTRIBUTES = (Private, ); }; };
985984
6507D29E0E871E5E00D7D896 /* JSTypeInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 6507D2970E871E4A00D7D896 /* JSTypeInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -1964,8 +1963,6 @@
19641963
0F235BCA17178E1C00690C7F /* FTLOSRExitCompiler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FTLOSRExitCompiler.h; path = ftl/FTLOSRExitCompiler.h; sourceTree = "<group>"; };
19651964
0F235BCB17178E1C00690C7F /* FTLThunks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FTLThunks.cpp; path = ftl/FTLThunks.cpp; sourceTree = "<group>"; };
19661965
0F235BCC17178E1C00690C7F /* FTLThunks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FTLThunks.h; path = ftl/FTLThunks.h; sourceTree = "<group>"; };
1967-
0F235BCD17178E1C00690C7F /* FTLValueFormat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FTLValueFormat.cpp; path = ftl/FTLValueFormat.cpp; sourceTree = "<group>"; };
1968-
0F235BCE17178E1C00690C7F /* FTLValueFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FTLValueFormat.h; path = ftl/FTLValueFormat.h; sourceTree = "<group>"; };
19691966
0F235BE717178E7300690C7F /* DFGOSRExitBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGOSRExitBase.cpp; path = dfg/DFGOSRExitBase.cpp; sourceTree = "<group>"; };
19701967
0F235BE817178E7300690C7F /* DFGOSRExitBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGOSRExitBase.h; path = dfg/DFGOSRExitBase.h; sourceTree = "<group>"; };
19711968
0F235BE917178E7300690C7F /* DFGOSRExitPreparation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGOSRExitPreparation.cpp; path = dfg/DFGOSRExitPreparation.cpp; sourceTree = "<group>"; };
@@ -2784,6 +2781,7 @@
27842781
62A9A29F1B0BED4800BD54CA /* DFGLazyNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGLazyNode.h; path = dfg/DFGLazyNode.h; sourceTree = "<group>"; };
27852782
62D2D38D1ADF103F000206C1 /* FunctionRareData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FunctionRareData.cpp; sourceTree = "<group>"; };
27862783
62D2D38E1ADF103F000206C1 /* FunctionRareData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FunctionRareData.h; sourceTree = "<group>"; };
2784+
62E3D5EF1B8D0B7300B868BB /* DataFormat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DataFormat.cpp; sourceTree = "<group>"; };
27872785
6507D2970E871E4A00D7D896 /* JSTypeInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSTypeInfo.h; sourceTree = "<group>"; };
27882786
651122E5140469BA002B101D /* testRegExp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = testRegExp.cpp; sourceTree = "<group>"; };
27892787
6511230514046A4C002B101D /* testRegExp */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testRegExp; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -3977,8 +3975,6 @@
39773975
0FEA0A1B1708B00700BB722C /* FTLTypedPointer.h */,
39783976
0F6B1CC11862C47800845D97 /* FTLUnwindInfo.cpp */,
39793977
0F6B1CC21862C47800845D97 /* FTLUnwindInfo.h */,
3980-
0F235BCD17178E1C00690C7F /* FTLValueFormat.cpp */,
3981-
0F235BCE17178E1C00690C7F /* FTLValueFormat.h */,
39823978
0FDB2CC8173DA51E007B3C1B /* FTLValueFromBlock.h */,
39833979
0F5A6281188C98D40072C9DF /* FTLValueRange.cpp */,
39843980
0F5A6282188C98D40072C9DF /* FTLValueRange.h */,
@@ -5547,6 +5543,7 @@
55475543
0F0B83A514BCF50400885B4F /* CodeType.h */,
55485544
0F6FC74E196110A800E1D02D /* ComplexGetStatus.cpp */,
55495545
0F6FC74F196110A800E1D02D /* ComplexGetStatus.h */,
5546+
62E3D5EF1B8D0B7300B868BB /* DataFormat.cpp */,
55505547
0F426A4A1460CD6B00131F8F /* DataFormat.h */,
55515548
0FC712DC17CD8778008CC93C /* DeferredCompilationCallback.cpp */,
55525549
0FC712DD17CD8778008CC93C /* DeferredCompilationCallback.h */,
@@ -6313,7 +6310,6 @@
63136310
0F235BE217178E1C00690C7F /* FTLThunks.h in Headers */,
63146311
0FEA0A201708B00700BB722C /* FTLTypedPointer.h in Headers */,
63156312
0F6B1CC61862C47800845D97 /* FTLUnwindInfo.h in Headers */,
6316-
0F235BE417178E1C00690C7F /* FTLValueFormat.h in Headers */,
63176313
0FDB2CCA173DA523007B3C1B /* FTLValueFromBlock.h in Headers */,
63186314
0FE7211E193B9C590031F6ED /* DFGTransition.h in Headers */,
63196315
0F5A6284188C98D40072C9DF /* FTLValueRange.h in Headers */,
@@ -7639,7 +7635,6 @@
76397635
0FEA0A161706BB9000BB722C /* FTLState.cpp in Sources */,
76407636
0F235BE117178E1C00690C7F /* FTLThunks.cpp in Sources */,
76417637
0F6B1CC51862C47800845D97 /* FTLUnwindInfo.cpp in Sources */,
7642-
0F235BE317178E1C00690C7F /* FTLValueFormat.cpp in Sources */,
76437638
0F5A1273192D9FDF008764A3 /* DFGDoesGC.cpp in Sources */,
76447639
A53CE08718BC1A5600BEDF76 /* JSConsole.cpp in Sources */,
76457640
0F5A6283188C98D40072C9DF /* FTLValueRange.cpp in Sources */,
@@ -7777,6 +7772,7 @@
77777772
7C184E1A17BEDBD3007CB63A /* JSPromise.cpp in Sources */,
77787773
7C184E2217BEE240007CB63A /* JSPromiseConstructor.cpp in Sources */,
77797774
A552C37F1ADDB8FE00139726 /* JSRemoteInspector.cpp in Sources */,
7775+
62E3D5F01B8D0B7300B868BB /* DataFormat.cpp in Sources */,
77807776
0F893BDB1936E23C001211F4 /* DFGStructureAbstractValue.cpp in Sources */,
77817777
7C008CDA187124BB00955C24 /* JSPromiseDeferred.cpp in Sources */,
77827778
7C184E1E17BEE22E007CB63A /* JSPromisePrototype.cpp in Sources */,

Source/JavaScriptCore/ftl/FTLValueFormat.h renamed to Source/JavaScriptCore/bytecode/DataFormat.cpp

Lines changed: 8 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2013 Apple Inc. All rights reserved.
2+
* Copyright (C) 2012-2015 Apple Inc. All rights reserved.
33
*
44
* Redistribution and use in source and binary forms, with or without
55
* modification, are permitted provided that the following conditions
@@ -23,45 +23,17 @@
2323
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2424
*/
2525

26-
#ifndef FTLValueFormat_h
27-
#define FTLValueFormat_h
26+
#include "config.h"
27+
#include "DataFormat.h"
2828

29-
#if ENABLE(FTL_JIT)
30-
31-
#include "GPRInfo.h"
29+
#include <wtf/Assertions.h>
3230
#include <wtf/PrintStream.h>
3331

34-
namespace JSC {
35-
36-
class AssemblyHelpers;
37-
38-
namespace FTL {
39-
40-
// Note that this is awkwardly similar to DataFormat in other parts of JSC, except that
41-
// unlike DataFormat and like ValueRecovery, it distinguishes between UInt32 and Int32.
42-
43-
enum ValueFormat {
44-
InvalidValueFormat,
45-
ValueFormatInt32,
46-
ValueFormatInt52,
47-
ValueFormatStrictInt52,
48-
ValueFormatBoolean,
49-
ValueFormatJSValue,
50-
ValueFormatDouble
51-
};
52-
53-
void reboxAccordingToFormat(
54-
ValueFormat, AssemblyHelpers&, GPRReg value, GPRReg scratch1, GPRReg scratch2);
55-
56-
} } // namespace JSC::FTL
57-
5832
namespace WTF {
5933

60-
void printInternal(PrintStream&, JSC::FTL::ValueFormat);
34+
void printInternal(PrintStream& out, JSC::DataFormat dataFormat)
35+
{
36+
out.print(dataFormatToString(dataFormat));
37+
}
6138

6239
} // namespace WTF
63-
64-
#endif // ENABLE(FTL_JIT)
65-
66-
#endif // FTLValueFormat_h
67-

‎Source/JavaScriptCore/bytecode/DataFormat.h‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,13 @@ inline bool isJSBoolean(DataFormat format)
121121
return isJSFormat(format, DataFormatJSBoolean);
122122
}
123123

124-
}
124+
} // namespace JSC
125+
126+
namespace WTF {
127+
128+
class PrintStream;
129+
void printInternal(PrintStream&, JSC::DataFormat);
130+
131+
} // namespace WTF
125132

126133
#endif // DataFormat_h

‎Source/JavaScriptCore/ftl/FTLAvailableRecovery.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,24 @@
2929
#if ENABLE(FTL_JIT)
3030

3131
#include "DFGNode.h"
32+
#include "DataFormat.h"
3233
#include "FTLAbbreviatedTypes.h"
3334
#include "FTLRecoveryOpcode.h"
34-
#include "FTLValueFormat.h"
3535

3636
namespace JSC { namespace FTL {
3737

3838
class AvailableRecovery {
3939
public:
4040
AvailableRecovery()
4141
: m_node(0)
42-
, m_format(InvalidValueFormat)
42+
, m_format(DataFormatNone)
4343
, m_opcode(AddRecovery)
4444
, m_left(0)
4545
, m_right(0)
4646
{
4747
}
4848

49-
AvailableRecovery(DFG::Node* node, RecoveryOpcode opcode, LValue left, LValue right, ValueFormat format)
49+
AvailableRecovery(DFG::Node* node, RecoveryOpcode opcode, LValue left, LValue right, DataFormat format)
5050
: m_node(node)
5151
, m_format(format)
5252
, m_opcode(opcode)
@@ -56,7 +56,7 @@ class AvailableRecovery {
5656
}
5757

5858
DFG::Node* node() const { return m_node; }
59-
ValueFormat format() const { return m_format; }
59+
DataFormat format() const { return m_format; }
6060
RecoveryOpcode opcode() const { return m_opcode; }
6161
LValue left() const { return m_left; }
6262
LValue right() const { return m_right; }
@@ -65,7 +65,7 @@ class AvailableRecovery {
6565

6666
private:
6767
DFG::Node* m_node;
68-
ValueFormat m_format;
68+
DataFormat m_format;
6969
RecoveryOpcode m_opcode;
7070
LValue m_left;
7171
LValue m_right;

‎Source/JavaScriptCore/ftl/FTLExitArgument.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,24 @@
2828

2929
#if ENABLE(FTL_JIT)
3030

31-
#include "FTLValueFormat.h"
31+
#include "DataFormat.h"
3232
#include <wtf/PrintStream.h>
3333

3434
namespace JSC { namespace FTL {
3535

3636
struct ExitArgumentRepresentation {
37-
ValueFormat format;
37+
DataFormat format;
3838
unsigned argument;
3939
};
4040

4141
class ExitArgument {
4242
public:
4343
ExitArgument()
4444
{
45-
m_representation.format = InvalidValueFormat;
45+
m_representation.format = DataFormatNone;
4646
}
4747

48-
ExitArgument(ValueFormat format, unsigned argument)
48+
ExitArgument(DataFormat format, unsigned argument)
4949
{
5050
m_representation.format = format;
5151
m_representation.argument = argument;
@@ -56,9 +56,9 @@ class ExitArgument {
5656
m_representation = representation;
5757
}
5858

59-
bool operator!() const { return m_representation.format == InvalidValueFormat; }
59+
bool operator!() const { return m_representation.format == DataFormatNone; }
6060

61-
ValueFormat format() const
61+
DataFormat format() const
6262
{
6363
ASSERT(*this);
6464
return m_representation.format;
@@ -70,7 +70,7 @@ class ExitArgument {
7070
return m_representation.argument;
7171
}
7272

73-
ExitArgument withFormat(ValueFormat format)
73+
ExitArgument withFormat(DataFormat format)
7474
{
7575
return ExitArgument(format, argument());
7676
}

0 commit comments

Comments
 (0)