Skip to content

Commit b6a15b2

Browse files
csaavedracsaavedra
committed
[JSC] Partially fix the build with unified builds disabled
https://bugs.webkit.org/show_bug.cgi?id=196647 Reviewed by Konstantin Tokarev. If you disable unified builds you find all kind of build errors. This partially tries to fix them but there's a lot more. * API/JSBaseInternal.h: * b3/air/AirAllocateRegistersAndStackAndGenerateCode.cpp: * b3/air/AirHandleCalleeSaves.h: * bytecode/ExecutableToCodeBlockEdge.cpp: * bytecode/ExitFlag.h: * bytecode/ICStatusUtils.h: * bytecode/UnlinkedMetadataTable.h: * dfg/DFGPureValue.h: * heap/IsoAlignedMemoryAllocator.cpp: * heap/IsoAlignedMemoryAllocator.h: Canonical link: https://commits.webkit.org/210961@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244019 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 69c7062 commit b6a15b2

11 files changed

Lines changed: 44 additions & 2 deletions

‎Source/JavaScriptCore/API/JSBaseInternal.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
namespace JSC {
3232
class JSLockHolder;
3333
class ExecState;
34+
class SourceCode;
3435
}
3536

3637
extern "C" JSValueRef JSEvaluateScriptInternal(const JSC::JSLockHolder&, JSC::ExecState*, JSContextRef, JSObjectRef thisObject, const JSC::SourceCode&, JSValueRef* exception);

‎Source/JavaScriptCore/ChangeLog‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
2019-04-08 Claudio Saavedra <[email protected]>
2+
3+
[JSC] Partially fix the build with unified builds disabled
4+
https://bugs.webkit.org/show_bug.cgi?id=196647
5+
6+
Reviewed by Konstantin Tokarev.
7+
8+
If you disable unified builds you find all kind of build
9+
errors. This partially tries to fix them but there's a lot
10+
more.
11+
12+
* API/JSBaseInternal.h:
13+
* b3/air/AirAllocateRegistersAndStackAndGenerateCode.cpp:
14+
* b3/air/AirHandleCalleeSaves.h:
15+
* bytecode/ExecutableToCodeBlockEdge.cpp:
16+
* bytecode/ExitFlag.h:
17+
* bytecode/ICStatusUtils.h:
18+
* bytecode/UnlinkedMetadataTable.h:
19+
* dfg/DFGPureValue.h:
20+
* heap/IsoAlignedMemoryAllocator.cpp:
21+
* heap/IsoAlignedMemoryAllocator.h:
22+
123
2019-04-08 Guillaume Emont <[email protected]>
224

325
Enable DFG on MIPS

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
#if ENABLE(B3_JIT)
3030

31+
#include "AirArgInlines.h"
3132
#include "AirBlockInsertionSet.h"
3233
#include "AirCode.h"
3334
#include "AirHandleCalleeSaves.h"

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@
2727

2828
#if ENABLE(B3_JIT)
2929

30-
namespace JSC { namespace B3 { namespace Air {
30+
namespace JSC {
31+
32+
class RegisterSet;
33+
34+
namespace B3 { namespace Air {
3135

3236
class Code;
3337

‎Source/JavaScriptCore/bytecode/ExecutableToCodeBlockEdge.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include "config.h"
2727
#include "ExecutableToCodeBlockEdge.h"
2828

29+
#include "CodeBlock.h"
2930
#include "IsoCellSetInlines.h"
3031

3132
namespace JSC {

‎Source/JavaScriptCore/bytecode/ExitFlag.h‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727

2828
#include "ExitingInlineKind.h"
2929

30+
namespace WTF {
31+
class PrintStream;
32+
} // namespace WTF
33+
3034
namespace JSC {
3135

3236
class ExitFlag {
@@ -87,7 +91,7 @@ class ExitFlag {
8791
return !!(*this & ExitFlag(true, inlineKind));
8892
}
8993

90-
void dump(PrintStream&) const;
94+
void dump(WTF::PrintStream&) const;
9195

9296
private:
9397
static constexpr uint8_t trueNotInlined = 1;

‎Source/JavaScriptCore/bytecode/ICStatusUtils.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929

3030
namespace JSC {
3131

32+
class CodeBlock;
33+
class StructureSet;
34+
3235
template<typename VariantVectorType, typename VariantType>
3336
bool appendICStatusVariant(VariantVectorType& variants, const VariantType& variant)
3437
{

‎Source/JavaScriptCore/bytecode/UnlinkedMetadataTable.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
#include "Opcode.h"
2929
#include <wtf/Ref.h>
30+
#include <wtf/RefCounted.h>
3031

3132
namespace JSC {
3233

‎Source/JavaScriptCore/dfg/DFGPureValue.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
#if ENABLE(DFG_JIT)
2929

30+
#include "DFGGraph.h"
3031
#include "DFGNode.h"
3132

3233
namespace JSC { namespace DFG {

‎Source/JavaScriptCore/heap/IsoAlignedMemoryAllocator.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
#include "config.h"
2727
#include "IsoAlignedMemoryAllocator.h"
28+
#include "MarkedBlock.h"
2829

2930
namespace JSC {
3031

0 commit comments

Comments
 (0)