Skip to content

Commit fc05f48

Browse files
JonWBedardJonWBedard
committed
Unreviewed, reverting 315349@main (dafcff7)
https://bugs.webkit.org/show_bug.cgi?id=317297 rdar://179923236 REGRESSION(315349@main): 'WebCore/AXTextStateChangeIntent.h' file not found Reverted change: [CMake] Expand prefix headers https://bugs.webkit.org/show_bug.cgi?id=317167 rdar://179758133 315349@main (dafcff7) Canonical link: https://commits.webkit.org/315367@main
1 parent d96202d commit fc05f48

89 files changed

Lines changed: 287 additions & 2355 deletions

File tree

Some content is hidden

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

‎Source/JavaScriptCore/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,6 @@ set(JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS
739739
bytecode/ValueProfile.h
740740
bytecode/ValueRecovery.h
741741
bytecode/VariableWriteFireDetail.h
742-
bytecode/VariableWriteFireDetailInlines.h
743742
bytecode/VirtualRegister.h
744743
bytecode/Watchpoint.h
745744

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,6 @@
380380
0F6B8AE31C4EFE1700969052 /* B3BreakCriticalEdges.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F6B8ADF1C4EFE1700969052 /* B3BreakCriticalEdges.h */; };
381381
0F6B8AE51C4EFE1700969052 /* B3FixSSA.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F6B8AE11C4EFE1700969052 /* B3FixSSA.h */; };
382382
0F6C73511AC9F99F00BE1682 /* VariableWriteFireDetail.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F6C734F1AC9F99F00BE1682 /* VariableWriteFireDetail.h */; settings = {ATTRIBUTES = (Private, ); }; };
383-
83F24BD93F604BFDACB5A4B2 /* VariableWriteFireDetailInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = D50629FD8E0B482F9852FA77 /* VariableWriteFireDetailInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
384383
0F6DB7E91D6124B500CDBF8E /* StackFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F6DB7E81D6124B200CDBF8E /* StackFrame.h */; settings = {ATTRIBUTES = (Private, ); }; };
385384
0F6FC751196110A800E1D02D /* ComplexGetStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F6FC74F196110A800E1D02D /* ComplexGetStatus.h */; settings = {ATTRIBUTES = (Private, ); }; };
386385
0F7025AA1714B0FC00382C0E /* DFGOSRExitCompilerCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F7025A81714B0F800382C0E /* DFGOSRExitCompilerCommon.h */; };
@@ -426,7 +425,6 @@
426425
0F8F2B9A172F0501007DBDA5 /* DFGDesiredIdentifiers.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F8F2B98172F04FD007DBDA5 /* DFGDesiredIdentifiers.h */; };
427426
0F8F94411667633200D61971 /* CodeBlockHash.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F8F943E1667632D00D61971 /* CodeBlockHash.h */; settings = {ATTRIBUTES = (Private, ); }; };
428427
0F919D0D157EE0A2004A4E7D /* JSSymbolTableObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F919D0A157EE09D004A4E7D /* JSSymbolTableObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
429-
276B391C2A71D2B600252F4E /* JSSymbolTableObjectInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 276B39042A71D2B300252F4E /* JSSymbolTableObjectInlines.h */; };
430428
0F919D11157F332C004A4E7D /* JSSegmentedVariableObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F919D0F157F3327004A4E7D /* JSSegmentedVariableObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
431429
0F919D2615853CE3004A4E7D /* Watchpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F919D2315853CDE004A4E7D /* Watchpoint.h */; settings = {ATTRIBUTES = (Private, ); }; };
432430
0F9327521C20BCBA00CF6564 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51F0EB6105C86C6B00E6DF1B /* Foundation.framework */; };
@@ -3317,7 +3315,6 @@
33173315
0F6B8AE11C4EFE1700969052 /* B3FixSSA.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = B3FixSSA.h; path = b3/B3FixSSA.h; sourceTree = "<group>"; };
33183316
0F6C734E1AC9F99F00BE1682 /* VariableWriteFireDetail.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VariableWriteFireDetail.cpp; sourceTree = "<group>"; };
33193317
0F6C734F1AC9F99F00BE1682 /* VariableWriteFireDetail.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VariableWriteFireDetail.h; sourceTree = "<group>"; };
3320-
D50629FD8E0B482F9852FA77 /* VariableWriteFireDetailInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VariableWriteFireDetailInlines.h; sourceTree = "<group>"; };
33213318
0F6DB7E71D6124B200CDBF8E /* StackFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StackFrame.cpp; sourceTree = "<group>"; };
33223319
0F6DB7E81D6124B200CDBF8E /* StackFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StackFrame.h; sourceTree = "<group>"; };
33233320
0F6DB7EB1D617D0F00CDBF8E /* MacroAssemblerCodeRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MacroAssemblerCodeRef.cpp; sourceTree = "<group>"; };
@@ -3396,7 +3393,6 @@
33963393
0F8F9445166764EE00D61971 /* CodeOrigin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CodeOrigin.cpp; sourceTree = "<group>"; };
33973394
0F919D09157EE09D004A4E7D /* JSSymbolTableObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSymbolTableObject.cpp; sourceTree = "<group>"; };
33983395
0F919D0A157EE09D004A4E7D /* JSSymbolTableObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSymbolTableObject.h; sourceTree = "<group>"; };
3399-
276B39042A71D2B300252F4E /* JSSymbolTableObjectInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSymbolTableObjectInlines.h; sourceTree = "<group>"; };
34003396
0F919D0E157F3327004A4E7D /* JSSegmentedVariableObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSegmentedVariableObject.cpp; sourceTree = "<group>"; };
34013397
0F919D0F157F3327004A4E7D /* JSSegmentedVariableObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSegmentedVariableObject.h; sourceTree = "<group>"; };
34023398
0F919D2215853CDE004A4E7D /* Watchpoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Watchpoint.cpp; sourceTree = "<group>"; };
@@ -9248,7 +9244,6 @@
92489244
2600B5A5152BAAA70091EE5F /* JSStringJoiner.h */,
92499245
0F919D09157EE09D004A4E7D /* JSSymbolTableObject.cpp */,
92509246
0F919D0A157EE09D004A4E7D /* JSSymbolTableObject.h */,
9251-
276B39042A71D2B300252F4E /* JSSymbolTableObjectInlines.h */,
92529247
70ECA6001AFDBEA200449739 /* JSTemplateObjectDescriptor.cpp */,
92539248
70ECA6011AFDBEA200449739 /* JSTemplateObjectDescriptor.h */,
92549249
276B38B02A71D25900252F4E /* JSTemplateObjectDescriptorInlines.h */,
@@ -10494,7 +10489,6 @@
1049410489
0F426A451460CBAB00131F8F /* ValueRecovery.h */,
1049510490
0F6C734E1AC9F99F00BE1682 /* VariableWriteFireDetail.cpp */,
1049610491
0F6C734F1AC9F99F00BE1682 /* VariableWriteFireDetail.h */,
10497-
D50629FD8E0B482F9852FA77 /* VariableWriteFireDetailInlines.h */,
1049810492
0F20C2581A8013AB00DA3229 /* VirtualRegister.cpp */,
1049910493
0F426A461460CBAB00131F8F /* VirtualRegister.h */,
1050010494
0F919D2215853CDE004A4E7D /* Watchpoint.cpp */,
@@ -12309,7 +12303,6 @@
1230912303
BC18C4290E16F5CD00B34460 /* JSStringRefCF.h in Headers */,
1231012304
1A28D4A8177B71C80007FA3C /* JSStringRefPrivate.h in Headers */,
1231112305
0F919D0D157EE0A2004A4E7D /* JSSymbolTableObject.h in Headers */,
12312-
276B391C2A71D2B600252F4E /* JSSymbolTableObjectInlines.h in Headers */,
1231312306
70ECA6061AFDBEA200449739 /* JSTemplateObjectDescriptor.h in Headers */,
1231412307
276B38D52A71D26400252F4E /* JSTemplateObjectDescriptorInlines.h in Headers */,
1231512308
AD5C36EA1F75AD6A000BCAAF /* JSToWasm.h in Headers */,
@@ -12859,7 +12852,6 @@
1285912852
79EE0C001B4AFB85000385C9 /* VariableEnvironment.h in Headers */,
1286012853
529A28C6401D36A330D2F209 /* VariableEnvironmentInlines.h in Headers */,
1286112854
0F6C73511AC9F99F00BE1682 /* VariableWriteFireDetail.h in Headers */,
12862-
83F24BD93F604BFDACB5A4B2 /* VariableWriteFireDetailInlines.h in Headers */,
1286312855
0FE0502D1AA9095600D33B33 /* VarOffset.h in Headers */,
1286412856
FE287D02252FB2E800D723F9 /* VerifierSlotVisitor.h in Headers */,
1286512857
6BCCEC0425D1FA27000F391D /* VerifierSlotVisitorInlines.h in Headers */,

‎Source/JavaScriptCore/JavaScriptCoreJITPrefix.h‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,6 @@
3333
#include "DFGGraph.h"
3434
#endif
3535

36-
#include <JavaScriptCore/ExceptionExpectation.h>
37-
#include <JavaScriptCore/HashMapHelper.h>
38-
#include <JavaScriptCore/JSOrderedHashTable.h>
39-
#include <JavaScriptCore/JSOrderedHashTableHelper.h>
40-
#include <JavaScriptCore/JSSet.h>
41-
#include <JavaScriptCore/ParserArena.h>
42-
#include <wtf/SmallSet.h>
43-
44-
4536
#define new ("if you use new/delete make sure to include config.h at the top of the file"())
4637
#define delete ("if you use new/delete make sure to include config.h at the top of the file"())
4738
#endif

‎Source/JavaScriptCore/bytecode/VariableWriteFireDetail.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include "VariableWriteFireDetail.h"
2828

2929
#include "JSCJSValueInlines.h"
30-
#include "VariableWriteFireDetailInlines.h"
3130

3231
namespace JSC {
3332

‎Source/JavaScriptCore/bytecode/VariableWriteFireDetail.h‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,12 @@ class PropertyName;
3434

3535
class VariableWriteFireDetail final : public FireDetail {
3636
public:
37-
inline VariableWriteFireDetail(JSObject*, const PropertyName&); // Defined in VariableWriteFireDetailInlines.h.
38-
37+
VariableWriteFireDetail(JSObject* object, const PropertyName& name)
38+
: m_object(object)
39+
, m_name(name)
40+
{
41+
}
42+
3943
JS_EXPORT_PRIVATE void dump(PrintStream&) const final;
4044

4145
JS_EXPORT_PRIVATE static void touch(VM&, WatchpointSet*, JSObject*, const PropertyName&);

‎Source/JavaScriptCore/bytecode/VariableWriteFireDetailInlines.h‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎Source/JavaScriptCore/dfg/DFGOperations.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
#include "JSGenericTypedArrayViewInlines.h"
6767
#include "JSCellButterfly.h"
6868
#include "JSIteratorHelper.h"
69-
#include "JSLexicalEnvironmentInlines.h"
69+
#include "JSLexicalEnvironment.h"
7070
#include "JSMap.h"
7171
#include "JSMapIterator.h"
7272
#include "JSPromise.h"

‎Source/JavaScriptCore/ftl/FTLOperations.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
#include "JSGenerator.h"
4848
#include "JSGeneratorFunction.h"
4949
#include "JSIteratorHelper.h"
50-
#include "JSLexicalEnvironmentInlines.h"
50+
#include "JSLexicalEnvironment.h"
5151
#include "JSMapIterator.h"
5252
#include "JSPromise.h"
5353
#include "JSPromiseReaction.h"

‎Source/JavaScriptCore/heap/MarkedBlock.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -352,9 +352,9 @@ class MarkedBlock {
352352
unsigned atomNumber(const void*);
353353
size_t candidateAtomNumber(const void*);
354354

355-
JS_EXPORT_PRIVATE size_t markCount();
355+
size_t markCount();
356356

357-
JS_EXPORT_PRIVATE bool isMarked(const void*);
357+
bool isMarked(const void*);
358358
bool isMarked(HeapVersion markingVersion, const void*);
359359
bool isMarked(const void*, Dependency);
360360
bool testAndSetMarked(const void*, Dependency);
@@ -380,7 +380,7 @@ class MarkedBlock {
380380
bool hasAnyMarked() const;
381381
inline void noteMarked();
382382
#if ASSERT_ENABLED
383-
JS_EXPORT_PRIVATE void assertValidCell(VM&, HeapCell*) const;
383+
void assertValidCell(VM&, HeapCell*) const;
384384
#else
385385
void assertValidCell(VM&, HeapCell*) const { }
386386
#endif
@@ -425,7 +425,7 @@ class MarkedBlock {
425425
JS_EXPORT_PRIVATE void aboutToMarkSlow(HeapVersion markingVersion, HeapCell*);
426426
void NODELETE clearHasAnyMarked();
427427

428-
JS_EXPORT_PRIVATE void noteMarkedSlow();
428+
void noteMarkedSlow();
429429

430430
inline bool marksConveyLivenessDuringMarking(HeapVersion markingVersion);
431431
inline bool marksConveyLivenessDuringMarking(HeapVersion myMarkingVersion, HeapVersion markingVersion);

‎Source/JavaScriptCore/heap/PreciseAllocation.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ class PreciseAllocation : public BasicRawSentinelNode<PreciseAllocation> {
141141
void noteMarked() { }
142142

143143
#if ASSERT_ENABLED
144-
JS_EXPORT_PRIVATE void assertValidCell(VM&, HeapCell*) const;
144+
void assertValidCell(VM&, HeapCell*) const;
145145
#else
146146
void assertValidCell(VM&, HeapCell*) const { }
147147
#endif

0 commit comments

Comments
 (0)