Objective-C API: Rename JSValue.h/APIJSValue.h to JSCJSValue.h/JSValue.h
https://bugs.webkit.org/show_bug.cgi?id=107327
Reviewed by Filip Pizlo.
Source/JavaScriptCore:
We're renaming these two files, so we have to replace the names everywhere.
* API/APICast.h:
* API/APIJSValue.h: Removed.
* API/JSBlockAdaptor.mm:
* API/JSStringRefCF.cpp:
* API/JSValue.h: Copied from Source/JavaScriptCore/API/APIJSValue.h.
* API/JSValue.mm:
* API/JSValueInternal.h:
* API/JSValueRef.cpp:
* API/JSWeakObjectMapRefPrivate.cpp:
* API/JavaScriptCore.h:
* CMakeLists.txt:
* GNUmakefile.list.am:
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* JavaScriptCore.xcodeproj/project.pbxproj:
* Target.pri:
* bytecode/CallLinkStatus.h:
* bytecode/CodeBlock.cpp:
* bytecode/MethodOfGettingAValueProfile.h:
* bytecode/ResolveGlobalStatus.cpp:
* bytecode/ResolveGlobalStatus.h:
* bytecode/SpeculatedType.h:
* bytecode/ValueRecovery.h:
* dfg/DFGByteCodeParser.cpp:
* dfg/DFGJITCompiler.cpp:
* dfg/DFGNode.h:
* dfg/DFGSpeculativeJIT.cpp:
* dfg/DFGSpeculativeJIT64.cpp:
* heap/CopiedBlock.h:
* heap/HandleStack.cpp:
* heap/HandleTypes.h:
* heap/WeakImpl.h:
* interpreter/Interpreter.h:
* interpreter/Register.h:
* interpreter/VMInspector.h:
* jit/HostCallReturnValue.cpp:
* jit/HostCallReturnValue.h:
* jit/JITCode.h:
* jit/JITExceptions.cpp:
* jit/JITExceptions.h:
* jit/JSInterfaceJIT.h:
* llint/LLIntCLoop.h:
* llint/LLIntData.h:
* llint/LLIntSlowPaths.cpp:
* profiler/ProfilerBytecode.h:
* profiler/ProfilerBytecodeSequence.h:
* profiler/ProfilerBytecodes.h:
* profiler/ProfilerCompilation.h:
* profiler/ProfilerCompiledBytecode.h:
* profiler/ProfilerDatabase.h:
* profiler/ProfilerOSRExit.h:
* profiler/ProfilerOSRExitSite.h:
* profiler/ProfilerOrigin.h:
* profiler/ProfilerOriginStack.h:
* runtime/ArgList.cpp:
* runtime/CachedTranscendentalFunction.h:
* runtime/CallData.h:
* runtime/Completion.h:
* runtime/ConstructData.h:
* runtime/DateConstructor.cpp:
* runtime/DateInstance.cpp:
* runtime/DatePrototype.cpp:
* runtime/JSAPIValueWrapper.h:
* runtime/JSCJSValue.cpp: Copied from Source/JavaScriptCore/runtime/JSValue.cpp.
* runtime/JSCJSValue.h: Copied from Source/JavaScriptCore/runtime/JSValue.h.
(JSValue):
* runtime/JSCJSValueInlines.h: Copied from Source/JavaScriptCore/runtime/JSValueInlines.h.
* runtime/JSGlobalData.h:
* runtime/JSGlobalObject.cpp:
* runtime/JSGlobalObjectFunctions.h:
* runtime/JSStringJoiner.h:
* runtime/JSValue.cpp: Removed.
* runtime/JSValue.h: Removed.
* runtime/JSValueInlines.h: Removed.
* runtime/LiteralParser.h:
* runtime/Operations.h:
* runtime/PropertyDescriptor.h:
* runtime/PropertySlot.h:
* runtime/Protect.h:
* runtime/RegExpPrototype.cpp:
* runtime/Structure.h:
Source/WebCore:
No new tests.
We're renaming these two files, so we have to replace the names everywhere.
* ForwardingHeaders/runtime/JSCJSValue.h: Copied from Source/WebCore/ForwardingHeaders/runtime/JSValue.h.
* ForwardingHeaders/runtime/JSValue.h: Removed.
* WebCore.vcproj/WebCore.vcproj:
* bindings/js/JSArrayBufferViewHelper.h:
* bindings/js/JSCustomXPathNSResolver.h:
* bindings/js/JSHTMLAllCollectionCustom.cpp:
* bindings/js/JSIntentConstructor.cpp:
* bindings/js/JSMessagePortCustom.h:
* bindings/js/JSNodeFilterCondition.h:
* bindings/js/JavaScriptCallFrame.cpp:
* bindings/js/ScriptCallStackFactory.cpp:
* bindings/js/ScriptValue.h:
* bindings/js/SerializedScriptValue.h:
* bindings/objc/WebScriptObjectPrivate.h:
* bridge/c/c_utility.h:
* bridge/testbindings.cpp:
* bridge/testbindings.mm:
* bridge/testqtbindings.cpp:
* plugins/PluginView.cpp:
* plugins/blackberry/PluginViewBlackBerry.cpp:
* plugins/gtk/PluginViewGtk.cpp:
* plugins/mac/PluginViewMac.mm:
* plugins/qt/PluginViewQt.cpp:
* plugins/win/PluginViewWin.cpp:
Source/WebKit/gtk:
We're renaming these two files, so we have to replace the names everywhere.
* WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
Source/WebKit/mac:
We're renaming these two files, so we have to replace the names everywhere.
* DOM/WebDOMOperations.mm:
* ForwardingHeaders/runtime/JSCJSValue.h: Copied from Source/WebKit/mac/ForwardingHeaders/runtime/JSValue.h.
* ForwardingHeaders/runtime/JSValue.h: Removed.
* WebView/WebFrame.mm:
* WebView/WebView.mm:
Source/WebKit/win:
We're renaming these two files, so we have to replace the names everywhere.
* WebFrame.cpp:
* WebView.cpp:
Source/WebKit/wx:
We're renaming these two files, so we have to replace the names everywhere.
* WebFrame.cpp:
* WebView.cpp:
Source/WebKit2:
We're renaming these two files, so we have to replace the names everywhere.
* WebProcess/WebPage/WebPage.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@140718 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/API/APICast.h b/Source/JavaScriptCore/API/APICast.h
index f019a7a..c83e636 100644
--- a/Source/JavaScriptCore/API/APICast.h
+++ b/Source/JavaScriptCore/API/APICast.h
@@ -27,8 +27,8 @@
#define APICast_h
#include "JSAPIValueWrapper.h"
+#include "JSCJSValue.h"
#include "JSGlobalObject.h"
-#include "JSValue.h"
#include <wtf/UnusedParam.h>
namespace JSC {
diff --git a/Source/JavaScriptCore/API/JSBlockAdaptor.mm b/Source/JavaScriptCore/API/JSBlockAdaptor.mm
index da9d5f1..9f970ee 100644
--- a/Source/JavaScriptCore/API/JSBlockAdaptor.mm
+++ b/Source/JavaScriptCore/API/JSBlockAdaptor.mm
@@ -34,7 +34,7 @@
#import "JSBlockAdaptor.h"
#import "JSContextInternal.h"
#import "JSWrapperMap.h"
-#import "JSValue.h"
+#import "JSCJSValue.h"
#import "JSValueInternal.h"
#import "ObjcRuntimeExtras.h"
#import "Operations.h"
diff --git a/Source/JavaScriptCore/API/JSStringRefCF.cpp b/Source/JavaScriptCore/API/JSStringRefCF.cpp
index fd72a59..724a729 100644
--- a/Source/JavaScriptCore/API/JSStringRefCF.cpp
+++ b/Source/JavaScriptCore/API/JSStringRefCF.cpp
@@ -30,7 +30,7 @@
#include "InitializeThreading.h"
#include "JSStringRef.h"
#include "OpaqueJSString.h"
-#include <runtime/JSValue.h>
+#include <runtime/JSCJSValue.h>
#include <wtf/OwnArrayPtr.h>
JSStringRef JSStringCreateWithCFString(CFStringRef string)
diff --git a/Source/JavaScriptCore/API/APIJSValue.h b/Source/JavaScriptCore/API/JSValue.h
similarity index 100%
rename from Source/JavaScriptCore/API/APIJSValue.h
rename to Source/JavaScriptCore/API/JSValue.h
diff --git a/Source/JavaScriptCore/API/JSValue.mm b/Source/JavaScriptCore/API/JSValue.mm
index 79b45c1..d368339 100644
--- a/Source/JavaScriptCore/API/JSValue.mm
+++ b/Source/JavaScriptCore/API/JSValue.mm
@@ -35,7 +35,7 @@
#import "JSWrapperMap.h"
#import "ObjcRuntimeExtras.h"
#import "Operations.h"
-#import "JSValue.h"
+#import "JSCJSValue.h"
#import "wtf/HashMap.h"
#import "wtf/HashSet.h"
#import "wtf/Vector.h"
diff --git a/Source/JavaScriptCore/API/JSValueInternal.h b/Source/JavaScriptCore/API/JSValueInternal.h
index 46cbb70..acab206 100644
--- a/Source/JavaScriptCore/API/JSValueInternal.h
+++ b/Source/JavaScriptCore/API/JSValueInternal.h
@@ -24,7 +24,7 @@
*/
#import <JavaScriptCore/JavaScriptCore.h>
-#import "APIJSValue.h"
+#import "JSValue.h"
#if JS_OBJC_API_ENABLED
diff --git a/Source/JavaScriptCore/API/JSValueRef.cpp b/Source/JavaScriptCore/API/JSValueRef.cpp
index 85038c2..d2913a9 100644
--- a/Source/JavaScriptCore/API/JSValueRef.cpp
+++ b/Source/JavaScriptCore/API/JSValueRef.cpp
@@ -30,13 +30,13 @@
#include "APIShims.h"
#include "JSCallbackObject.h"
+#include <runtime/JSCJSValue.h>
#include <runtime/JSGlobalObject.h>
#include <runtime/JSONObject.h>
#include <runtime/JSString.h>
#include <runtime/LiteralParser.h>
#include <runtime/Operations.h>
#include <runtime/Protect.h>
-#include <runtime/JSValue.h>
#include <wtf/Assertions.h>
#include <wtf/text/StringHash.h>
diff --git a/Source/JavaScriptCore/API/JSWeakObjectMapRefPrivate.cpp b/Source/JavaScriptCore/API/JSWeakObjectMapRefPrivate.cpp
index e69e78e..094eee1 100644
--- a/Source/JavaScriptCore/API/JSWeakObjectMapRefPrivate.cpp
+++ b/Source/JavaScriptCore/API/JSWeakObjectMapRefPrivate.cpp
@@ -28,8 +28,8 @@
#include "APICast.h"
#include "APIShims.h"
+#include "JSCJSValue.h"
#include "JSCallbackObject.h"
-#include "JSValue.h"
#include "JSWeakObjectMapRefInternal.h"
#include "Operations.h"
#include <wtf/HashMap.h>
diff --git a/Source/JavaScriptCore/API/JavaScriptCore.h b/Source/JavaScriptCore/API/JavaScriptCore.h
index 350b61e..26bb3f1 100644
--- a/Source/JavaScriptCore/API/JavaScriptCore.h
+++ b/Source/JavaScriptCore/API/JavaScriptCore.h
@@ -32,7 +32,7 @@
#if defined(__OBJC__) && JS_OBJC_API_ENABLED
#import "JSContext.h"
-#import "APIJSValue.h"
+#import "JSValue.h"
#import "JSVirtualMachine.h"
#import "JSExport.h"
diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
index 3d6672f..a378e77 100644
--- a/Source/JavaScriptCore/CMakeLists.txt
+++ b/Source/JavaScriptCore/CMakeLists.txt
@@ -247,7 +247,7 @@
runtime/JSString.cpp
runtime/JSStringJoiner.cpp
runtime/JSSymbolTableObject.cpp
- runtime/JSValue.cpp
+ runtime/JSCJSValue.cpp
runtime/JSVariableObject.cpp
runtime/JSWrapperObject.cpp
runtime/LiteralParser.cpp
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 88cb1fb..5cdb49c 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,93 @@
+2013-01-24 Mark Hahnenberg <mhahnenberg@apple.com>
+
+ Objective-C API: Rename JSValue.h/APIJSValue.h to JSCJSValue.h/JSValue.h
+ https://bugs.webkit.org/show_bug.cgi?id=107327
+
+ Reviewed by Filip Pizlo.
+
+ We're renaming these two files, so we have to replace the names everywhere.
+
+ * API/APICast.h:
+ * API/APIJSValue.h: Removed.
+ * API/JSBlockAdaptor.mm:
+ * API/JSStringRefCF.cpp:
+ * API/JSValue.h: Copied from Source/JavaScriptCore/API/APIJSValue.h.
+ * API/JSValue.mm:
+ * API/JSValueInternal.h:
+ * API/JSValueRef.cpp:
+ * API/JSWeakObjectMapRefPrivate.cpp:
+ * API/JavaScriptCore.h:
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * Target.pri:
+ * bytecode/CallLinkStatus.h:
+ * bytecode/CodeBlock.cpp:
+ * bytecode/MethodOfGettingAValueProfile.h:
+ * bytecode/ResolveGlobalStatus.cpp:
+ * bytecode/ResolveGlobalStatus.h:
+ * bytecode/SpeculatedType.h:
+ * bytecode/ValueRecovery.h:
+ * dfg/DFGByteCodeParser.cpp:
+ * dfg/DFGJITCompiler.cpp:
+ * dfg/DFGNode.h:
+ * dfg/DFGSpeculativeJIT.cpp:
+ * dfg/DFGSpeculativeJIT64.cpp:
+ * heap/CopiedBlock.h:
+ * heap/HandleStack.cpp:
+ * heap/HandleTypes.h:
+ * heap/WeakImpl.h:
+ * interpreter/Interpreter.h:
+ * interpreter/Register.h:
+ * interpreter/VMInspector.h:
+ * jit/HostCallReturnValue.cpp:
+ * jit/HostCallReturnValue.h:
+ * jit/JITCode.h:
+ * jit/JITExceptions.cpp:
+ * jit/JITExceptions.h:
+ * jit/JSInterfaceJIT.h:
+ * llint/LLIntCLoop.h:
+ * llint/LLIntData.h:
+ * llint/LLIntSlowPaths.cpp:
+ * profiler/ProfilerBytecode.h:
+ * profiler/ProfilerBytecodeSequence.h:
+ * profiler/ProfilerBytecodes.h:
+ * profiler/ProfilerCompilation.h:
+ * profiler/ProfilerCompiledBytecode.h:
+ * profiler/ProfilerDatabase.h:
+ * profiler/ProfilerOSRExit.h:
+ * profiler/ProfilerOSRExitSite.h:
+ * profiler/ProfilerOrigin.h:
+ * profiler/ProfilerOriginStack.h:
+ * runtime/ArgList.cpp:
+ * runtime/CachedTranscendentalFunction.h:
+ * runtime/CallData.h:
+ * runtime/Completion.h:
+ * runtime/ConstructData.h:
+ * runtime/DateConstructor.cpp:
+ * runtime/DateInstance.cpp:
+ * runtime/DatePrototype.cpp:
+ * runtime/JSAPIValueWrapper.h:
+ * runtime/JSCJSValue.cpp: Copied from Source/JavaScriptCore/runtime/JSValue.cpp.
+ * runtime/JSCJSValue.h: Copied from Source/JavaScriptCore/runtime/JSValue.h.
+ (JSValue):
+ * runtime/JSCJSValueInlines.h: Copied from Source/JavaScriptCore/runtime/JSValueInlines.h.
+ * runtime/JSGlobalData.h:
+ * runtime/JSGlobalObject.cpp:
+ * runtime/JSGlobalObjectFunctions.h:
+ * runtime/JSStringJoiner.h:
+ * runtime/JSValue.cpp: Removed.
+ * runtime/JSValue.h: Removed.
+ * runtime/JSValueInlines.h: Removed.
+ * runtime/LiteralParser.h:
+ * runtime/Operations.h:
+ * runtime/PropertyDescriptor.h:
+ * runtime/PropertySlot.h:
+ * runtime/Protect.h:
+ * runtime/RegExpPrototype.cpp:
+ * runtime/Structure.h:
+
2013-01-23 Oliver Hunt <oliver@apple.com>
Harden JSC a bit with RELEASE_ASSERT
diff --git a/Source/JavaScriptCore/GNUmakefile.list.am b/Source/JavaScriptCore/GNUmakefile.list.am
index fc507f3..281f545 100644
--- a/Source/JavaScriptCore/GNUmakefile.list.am
+++ b/Source/JavaScriptCore/GNUmakefile.list.am
@@ -646,9 +646,9 @@
Source/JavaScriptCore/runtime/JSSymbolTableObject.h \
Source/JavaScriptCore/runtime/JSType.h \
Source/JavaScriptCore/runtime/JSTypeInfo.h \
- Source/JavaScriptCore/runtime/JSValue.cpp \
- Source/JavaScriptCore/runtime/JSValue.h \
- Source/JavaScriptCore/runtime/JSValueInlines.h \
+ Source/JavaScriptCore/runtime/JSCJSValue.cpp \
+ Source/JavaScriptCore/runtime/JSCJSValue.h \
+ Source/JavaScriptCore/runtime/JSCJSValueInlines.h \
Source/JavaScriptCore/runtime/JSVariableObject.cpp \
Source/JavaScriptCore/runtime/JSVariableObject.h \
Source/JavaScriptCore/runtime/JSWithScope.h \
diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
index fdd0a01..29fd95f 100644
--- a/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
@@ -982,15 +982,15 @@
>
</File>
<File
- RelativePath="..\..\runtime\JSValue.cpp"
+ RelativePath="..\..\runtime\JSCJSValue.cpp"
>
</File>
<File
- RelativePath="..\..\runtime\JSValue.h"
+ RelativePath="..\..\runtime\JSCJSValue.h"
>
</File>
<File
- RelativePath="..\..\runtime\JSValueInlines.h"
+ RelativePath="..\..\runtime\JSCJSValueInlines.h"
>
</File>
<File
diff --git a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
index 0464505..4312596 100644
--- a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -426,7 +426,7 @@
147F39D2107EC37600427A48 /* JSGlobalObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14DE0D680D02431400AACCA2 /* JSGlobalObject.cpp */; };
147F39D4107EC37600427A48 /* JSObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC22A3980E16E14800AF21C8 /* JSObject.cpp */; };
147F39D5107EC37600427A48 /* JSString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC02E9B60E1842FA000F9297 /* JSString.cpp */; };
- 147F39D6107EC37600427A48 /* JSValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F692A8870255597D01FF60F7 /* JSValue.cpp */; };
+ 147F39D6107EC37600427A48 /* JSCJSValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F692A8870255597D01FF60F7 /* JSCJSValue.cpp */; };
147F39D7107EC37600427A48 /* JSVariableObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC22A39A0E16E14800AF21C8 /* JSVariableObject.cpp */; };
14816E1B154CC56C00B8054C /* BlockAllocator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14816E19154CC56C00B8054C /* BlockAllocator.cpp */; };
14816E1C154CC56C00B8054C /* BlockAllocator.h in Headers */ = {isa = PBXBuildFile; fileRef = 14816E1A154CC56C00B8054C /* BlockAllocator.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -502,7 +502,7 @@
863C6D9C1521111A00585E4E /* YarrCanonicalizeUCS2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 863C6D981521111200585E4E /* YarrCanonicalizeUCS2.cpp */; };
8642C510151C06A90046D4EF /* RegExpCachedResult.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 86F75EFB151C062F007C9BA3 /* RegExpCachedResult.cpp */; };
8642C512151C083D0046D4EF /* RegExpMatchesArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 86F75EFD151C062F007C9BA3 /* RegExpMatchesArray.cpp */; };
- 865A30F1135007E100CDB49E /* JSValueInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 865A30F0135007E100CDB49E /* JSValueInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 865A30F1135007E100CDB49E /* JSCJSValueInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 865A30F0135007E100CDB49E /* JSCJSValueInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
865F408810E7D56300947361 /* APIShims.h in Headers */ = {isa = PBXBuildFile; fileRef = 865F408710E7D56300947361 /* APIShims.h */; settings = {ATTRIBUTES = (Private, ); }; };
866739D213BFDE710023D87C /* BigInteger.h in Headers */ = {isa = PBXBuildFile; fileRef = 866739D013BFDE710023D87C /* BigInteger.h */; };
866739D313BFDE710023D87C /* Uint16WithFraction.h in Headers */ = {isa = PBXBuildFile; fileRef = 866739D113BFDE710023D87C /* Uint16WithFraction.h */; };
@@ -551,7 +551,7 @@
86D3B3C410159D7F002865E7 /* RepatchBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 86D3B3C210159D7F002865E7 /* RepatchBuffer.h */; settings = {ATTRIBUTES = (Private, ); }; };
86DB64640F95C6FC00D7D921 /* ExecutableAllocatorFixedVMPool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 86DB64630F95C6FC00D7D921 /* ExecutableAllocatorFixedVMPool.cpp */; };
86E116B10FE75AC800B512BC /* CodeLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 86E116B00FE75AC800B512BC /* CodeLocation.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 86E3C612167BABD7006D760A /* APIJSValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 86E3C606167BAB87006D760A /* APIJSValue.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 86E3C612167BABD7006D760A /* JSValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 86E3C606167BAB87006D760A /* JSValue.h */; settings = {ATTRIBUTES = (Public, ); }; };
86E3C613167BABD7006D760A /* JSContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 86E3C607167BAB87006D760A /* JSContext.h */; settings = {ATTRIBUTES = (Public, ); }; };
86E3C614167BABD7006D760A /* JSExport.h in Headers */ = {isa = PBXBuildFile; fileRef = 86E3C60A167BAB87006D760A /* JSExport.h */; settings = {ATTRIBUTES = (Public, ); }; };
86E3C615167BABD7006D760A /* JSVirtualMachine.h in Headers */ = {isa = PBXBuildFile; fileRef = 86E3C60F167BAB87006D760A /* JSVirtualMachine.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -719,7 +719,7 @@
BC18C4280E16F5CD00B34460 /* JSStringRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 1482B74B0A43032800517CFC /* JSStringRef.h */; settings = {ATTRIBUTES = (Public, ); }; };
BC18C4290E16F5CD00B34460 /* JSStringRefCF.h in Headers */ = {isa = PBXBuildFile; fileRef = 146AAB2A0B66A84900E55F16 /* JSStringRefCF.h */; settings = {ATTRIBUTES = (Public, ); }; };
BC18C42A0E16F5CD00B34460 /* JSType.h in Headers */ = {isa = PBXBuildFile; fileRef = 14ABB454099C2A0F00E2A24F /* JSType.h */; settings = {ATTRIBUTES = (Private, ); }; };
- BC18C42B0E16F5CD00B34460 /* JSValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 14ABB36E099C076400E2A24F /* JSValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ BC18C42B0E16F5CD00B34460 /* JSCJSValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 14ABB36E099C076400E2A24F /* JSCJSValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC18C42C0E16F5CD00B34460 /* JSValueRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 1482B6EA0A4300B300517CFC /* JSValueRef.h */; settings = {ATTRIBUTES = (Public, ); }; };
BC18C42D0E16F5CD00B34460 /* JSVariableObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 14F252560D08DD8D004ECFFF /* JSVariableObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC18C42E0E16F5CD00B34460 /* JSWrapperObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 65C7A1720A8EAACB00FA37EA /* JSWrapperObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -1263,7 +1263,7 @@
14A42E3D0F4F60EE00599099 /* TimeoutChecker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TimeoutChecker.cpp; sourceTree = "<group>"; };
14A42E3E0F4F60EE00599099 /* TimeoutChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimeoutChecker.h; sourceTree = "<group>"; };
14A6581A0F4E36F4000150FD /* JITStubs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JITStubs.h; sourceTree = "<group>"; };
- 14ABB36E099C076400E2A24F /* JSValue.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSValue.h; sourceTree = "<group>"; };
+ 14ABB36E099C076400E2A24F /* JSCJSValue.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSCJSValue.h; sourceTree = "<group>"; };
14ABB454099C2A0F00E2A24F /* JSType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSType.h; sourceTree = "<group>"; };
14ABDF5D0A437FEF00ECCA01 /* JSCallbackObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCallbackObject.h; sourceTree = "<group>"; };
14ABDF5E0A437FEF00ECCA01 /* JSCallbackObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCallbackObject.cpp; sourceTree = "<group>"; };
@@ -1356,7 +1356,7 @@
863C6D981521111200585E4E /* YarrCanonicalizeUCS2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = YarrCanonicalizeUCS2.cpp; path = yarr/YarrCanonicalizeUCS2.cpp; sourceTree = "<group>"; };
863C6D991521111200585E4E /* YarrCanonicalizeUCS2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YarrCanonicalizeUCS2.h; path = yarr/YarrCanonicalizeUCS2.h; sourceTree = "<group>"; };
863C6D9A1521111200585E4E /* YarrCanonicalizeUCS2.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = YarrCanonicalizeUCS2.js; path = yarr/YarrCanonicalizeUCS2.js; sourceTree = "<group>"; };
- 865A30F0135007E100CDB49E /* JSValueInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSValueInlines.h; sourceTree = "<group>"; };
+ 865A30F0135007E100CDB49E /* JSCJSValueInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCJSValueInlines.h; sourceTree = "<group>"; };
865F408710E7D56300947361 /* APIShims.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIShims.h; sourceTree = "<group>"; };
866739D013BFDE710023D87C /* BigInteger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BigInteger.h; sourceTree = "<group>"; };
866739D113BFDE710023D87C /* Uint16WithFraction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Uint16WithFraction.h; sourceTree = "<group>"; };
@@ -1411,7 +1411,7 @@
86D3B3C210159D7F002865E7 /* RepatchBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RepatchBuffer.h; sourceTree = "<group>"; };
86DB64630F95C6FC00D7D921 /* ExecutableAllocatorFixedVMPool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExecutableAllocatorFixedVMPool.cpp; sourceTree = "<group>"; };
86E116B00FE75AC800B512BC /* CodeLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CodeLocation.h; sourceTree = "<group>"; };
- 86E3C606167BAB87006D760A /* APIJSValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIJSValue.h; sourceTree = "<group>"; };
+ 86E3C606167BAB87006D760A /* JSValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSValue.h; sourceTree = "<group>"; };
86E3C607167BAB87006D760A /* JSContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSContext.h; sourceTree = "<group>"; };
86E3C608167BAB87006D760A /* JSContext.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = JSContext.mm; sourceTree = "<group>"; };
86E3C609167BAB87006D760A /* JSContextInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSContextInternal.h; sourceTree = "<group>"; };
@@ -1718,7 +1718,7 @@
F692A87C0255597D01FF60F7 /* RegExpObject.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = RegExpObject.h; sourceTree = "<group>"; tabWidth = 8; };
F692A87D0255597D01FF60F7 /* RegExp.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RegExp.cpp; sourceTree = "<group>"; tabWidth = 8; };
F692A87E0255597D01FF60F7 /* RegExp.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = RegExp.h; sourceTree = "<group>"; tabWidth = 8; };
- F692A8870255597D01FF60F7 /* JSValue.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSValue.cpp; sourceTree = "<group>"; tabWidth = 8; };
+ F692A8870255597D01FF60F7 /* JSCJSValue.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCJSValue.cpp; sourceTree = "<group>"; tabWidth = 8; };
FE20CE9B15F04A9500DF3430 /* LLIntCLoop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LLIntCLoop.cpp; path = llint/LLIntCLoop.cpp; sourceTree = "<group>"; };
FE20CE9C15F04A9500DF3430 /* LLIntCLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LLIntCLoop.h; path = llint/LLIntCLoop.h; sourceTree = "<group>"; };
FE4A331D15BD2E07006F54F3 /* VMInspector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VMInspector.cpp; sourceTree = "<group>"; };
@@ -2088,7 +2088,7 @@
isa = PBXGroup;
children = (
1482B78A0A4305AB00517CFC /* APICast.h */,
- 86E3C606167BAB87006D760A /* APIJSValue.h */,
+ 86E3C606167BAB87006D760A /* JSValue.h */,
865F408710E7D56300947361 /* APIShims.h */,
1CAA8B4A0D32C39A0041BCFF /* JavaScript.h */,
1CAA8B4B0D32C39A0041BCFF /* JavaScriptCore.h */,
@@ -2389,9 +2389,9 @@
0F919D0A157EE09D004A4E7D /* JSSymbolTableObject.h */,
14ABB454099C2A0F00E2A24F /* JSType.h */,
6507D2970E871E4A00D7D896 /* JSTypeInfo.h */,
- F692A8870255597D01FF60F7 /* JSValue.cpp */,
- 14ABB36E099C076400E2A24F /* JSValue.h */,
- 865A30F0135007E100CDB49E /* JSValueInlines.h */,
+ F692A8870255597D01FF60F7 /* JSCJSValue.cpp */,
+ 14ABB36E099C076400E2A24F /* JSCJSValue.h */,
+ 865A30F0135007E100CDB49E /* JSCJSValueInlines.h */,
BC22A39A0E16E14800AF21C8 /* JSVariableObject.cpp */,
14F252560D08DD8D004ECFFF /* JSVariableObject.h */,
1442565F15EDE98D0066A49B /* JSWithScope.cpp */,
@@ -2838,7 +2838,7 @@
860161E30F3A83C100F84710 /* AbstractMacroAssembler.h in Headers */,
0F55F0F514D1063C00AC7649 /* AbstractPC.h in Headers */,
BC18C3E50E16F5CD00B34460 /* APICast.h in Headers */,
- 86E3C612167BABD7006D760A /* APIJSValue.h in Headers */,
+ 86E3C612167BABD7006D760A /* JSValue.h in Headers */,
865F408810E7D56300947361 /* APIShims.h in Headers */,
BCF605140E203EF800B9A64D /* ArgList.h in Headers */,
BC257DE80E1F51C50016B6C9 /* Arguments.h in Headers */,
@@ -3076,8 +3076,8 @@
0F919D0D157EE0A2004A4E7D /* JSSymbolTableObject.h in Headers */,
BC18C42A0E16F5CD00B34460 /* JSType.h in Headers */,
6507D29E0E871E5E00D7D896 /* JSTypeInfo.h in Headers */,
- BC18C42B0E16F5CD00B34460 /* JSValue.h in Headers */,
- 865A30F1135007E100CDB49E /* JSValueInlines.h in Headers */,
+ BC18C42B0E16F5CD00B34460 /* JSCJSValue.h in Headers */,
+ 865A30F1135007E100CDB49E /* JSCJSValueInlines.h in Headers */,
86E3C61B167BABEE006D760A /* JSValueInternal.h in Headers */,
BC18C42C0E16F5CD00B34460 /* JSValueRef.h in Headers */,
BC18C42D0E16F5CD00B34460 /* JSVariableObject.h in Headers */,
@@ -3784,7 +3784,7 @@
1482B74E0A43032800517CFC /* JSStringRef.cpp in Sources */,
146AAB380B66A94400E55F16 /* JSStringRefCF.cpp in Sources */,
0F919D0C157EE09F004A4E7D /* JSSymbolTableObject.cpp in Sources */,
- 147F39D6107EC37600427A48 /* JSValue.cpp in Sources */,
+ 147F39D6107EC37600427A48 /* JSCJSValue.cpp in Sources */,
86E3C61A167BABEE006D760A /* JSValue.mm in Sources */,
14BD5A320A3E91F600BAF59C /* JSValueRef.cpp in Sources */,
147F39D7107EC37600427A48 /* JSVariableObject.cpp in Sources */,
diff --git a/Source/JavaScriptCore/Target.pri b/Source/JavaScriptCore/Target.pri
index 882acee..aaf6c17 100644
--- a/Source/JavaScriptCore/Target.pri
+++ b/Source/JavaScriptCore/Target.pri
@@ -266,7 +266,7 @@
runtime/JSString.cpp \
runtime/JSStringJoiner.cpp \
runtime/JSSymbolTableObject.cpp \
- runtime/JSValue.cpp \
+ runtime/JSCJSValue.cpp \
runtime/JSVariableObject.cpp \
runtime/JSWrapperObject.cpp \
runtime/LiteralParser.cpp \
diff --git a/Source/JavaScriptCore/bytecode/CallLinkStatus.h b/Source/JavaScriptCore/bytecode/CallLinkStatus.h
index 9511060..888e56e 100644
--- a/Source/JavaScriptCore/bytecode/CallLinkStatus.h
+++ b/Source/JavaScriptCore/bytecode/CallLinkStatus.h
@@ -28,7 +28,7 @@
#include "CodeSpecializationKind.h"
#include "Intrinsic.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
namespace JSC {
diff --git a/Source/JavaScriptCore/bytecode/CodeBlock.cpp b/Source/JavaScriptCore/bytecode/CodeBlock.cpp
index a3bc2bb..dda578d 100644
--- a/Source/JavaScriptCore/bytecode/CodeBlock.cpp
+++ b/Source/JavaScriptCore/bytecode/CodeBlock.cpp
@@ -41,9 +41,9 @@
#include "JIT.h"
#include "JITStubs.h"
#include "JSActivation.h"
+#include "JSCJSValue.h"
#include "JSFunction.h"
#include "JSNameScope.h"
-#include "JSValue.h"
#include "LowLevelInterpreter.h"
#include "Operations.h"
#include "ReduceWhitespace.h"
diff --git a/Source/JavaScriptCore/bytecode/MethodOfGettingAValueProfile.h b/Source/JavaScriptCore/bytecode/MethodOfGettingAValueProfile.h
index 0f5c2be..c6fe6c5 100644
--- a/Source/JavaScriptCore/bytecode/MethodOfGettingAValueProfile.h
+++ b/Source/JavaScriptCore/bytecode/MethodOfGettingAValueProfile.h
@@ -34,7 +34,7 @@
// these #if's will disappear...
#if ENABLE(DFG_JIT)
-#include "JSValue.h"
+#include "JSCJSValue.h"
namespace JSC {
diff --git a/Source/JavaScriptCore/bytecode/ResolveGlobalStatus.cpp b/Source/JavaScriptCore/bytecode/ResolveGlobalStatus.cpp
index 0cee38d..37d83c9 100644
--- a/Source/JavaScriptCore/bytecode/ResolveGlobalStatus.cpp
+++ b/Source/JavaScriptCore/bytecode/ResolveGlobalStatus.cpp
@@ -27,7 +27,7 @@
#include "ResolveGlobalStatus.h"
#include "CodeBlock.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include "Operations.h"
#include "Structure.h"
diff --git a/Source/JavaScriptCore/bytecode/ResolveGlobalStatus.h b/Source/JavaScriptCore/bytecode/ResolveGlobalStatus.h
index 46a9254..6763ff7 100644
--- a/Source/JavaScriptCore/bytecode/ResolveGlobalStatus.h
+++ b/Source/JavaScriptCore/bytecode/ResolveGlobalStatus.h
@@ -26,7 +26,7 @@
#ifndef ResolveGlobalStatus_h
#define ResolveGlobalStatus_h
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include "PropertyOffset.h"
#include <wtf/NotFound.h>
diff --git a/Source/JavaScriptCore/bytecode/SpeculatedType.h b/Source/JavaScriptCore/bytecode/SpeculatedType.h
index 261a26b..5300c82 100644
--- a/Source/JavaScriptCore/bytecode/SpeculatedType.h
+++ b/Source/JavaScriptCore/bytecode/SpeculatedType.h
@@ -29,7 +29,7 @@
#ifndef SpeculatedType_h
#define SpeculatedType_h
-#include "JSValue.h"
+#include "JSCJSValue.h"
namespace JSC {
diff --git a/Source/JavaScriptCore/bytecode/ValueRecovery.h b/Source/JavaScriptCore/bytecode/ValueRecovery.h
index e656e57..77d5a10 100644
--- a/Source/JavaScriptCore/bytecode/ValueRecovery.h
+++ b/Source/JavaScriptCore/bytecode/ValueRecovery.h
@@ -27,7 +27,7 @@
#define ValueRecovery_h
#include "DataFormat.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include "MacroAssembler.h"
#include "VirtualRegister.h"
#include <stdio.h>
diff --git a/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp b/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
index 99cd665..d0c49aa 100644
--- a/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
+++ b/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
@@ -35,7 +35,7 @@
#include "DFGArrayMode.h"
#include "DFGCapabilities.h"
#include "GetByIdStatus.h"
-#include "JSValueInlines.h"
+#include "JSCJSValueInlines.h"
#include "PutByIdStatus.h"
#include "ResolveGlobalStatus.h"
#include <wtf/HashMap.h>
diff --git a/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp b/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp
index 2842599..827d7ad 100644
--- a/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp
+++ b/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp
@@ -35,8 +35,8 @@
#include "DFGSlowPathGenerator.h"
#include "DFGSpeculativeJIT.h"
#include "DFGThunks.h"
+#include "JSCJSValueInlines.h"
#include "JSGlobalData.h"
-#include "JSValueInlines.h"
#include "LinkBuffer.h"
namespace JSC { namespace DFG {
diff --git a/Source/JavaScriptCore/dfg/DFGNode.h b/Source/JavaScriptCore/dfg/DFGNode.h
index 8862bac..2aa7216 100644
--- a/Source/JavaScriptCore/dfg/DFGNode.h
+++ b/Source/JavaScriptCore/dfg/DFGNode.h
@@ -39,7 +39,7 @@
#include "DFGNodeFlags.h"
#include "DFGNodeType.h"
#include "DFGVariableAccessData.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include "Operands.h"
#include "SpeculatedType.h"
#include "StructureSet.h"
diff --git a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp
index 67ae9c4..12178ad 100644
--- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp
+++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp
@@ -32,7 +32,7 @@
#include "DFGArrayifySlowPathGenerator.h"
#include "DFGCallArrayAllocatorSlowPathGenerator.h"
#include "DFGSlowPathGenerator.h"
-#include "JSValueInlines.h"
+#include "JSCJSValueInlines.h"
#include "LinkBuffer.h"
namespace JSC { namespace DFG {
diff --git a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp
index 79fedda..7634ad6 100644
--- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp
+++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp
@@ -32,7 +32,7 @@
#include "ArrayPrototype.h"
#include "DFGCallArrayAllocatorSlowPathGenerator.h"
#include "DFGSlowPathGenerator.h"
-#include "JSValueInlines.h"
+#include "JSCJSValueInlines.h"
#include "ObjectPrototype.h"
namespace JSC { namespace DFG {
diff --git a/Source/JavaScriptCore/heap/CopiedBlock.h b/Source/JavaScriptCore/heap/CopiedBlock.h
index bd5784b..66083a6 100644
--- a/Source/JavaScriptCore/heap/CopiedBlock.h
+++ b/Source/JavaScriptCore/heap/CopiedBlock.h
@@ -29,7 +29,7 @@
#include "BlockAllocator.h"
#include "CopyWorkList.h"
#include "HeapBlock.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include "Options.h"
#include <wtf/Atomics.h>
#include <wtf/OwnPtr.h>
diff --git a/Source/JavaScriptCore/heap/HandleStack.cpp b/Source/JavaScriptCore/heap/HandleStack.cpp
index a5653c7..39d18f8 100644
--- a/Source/JavaScriptCore/heap/HandleStack.cpp
+++ b/Source/JavaScriptCore/heap/HandleStack.cpp
@@ -27,8 +27,8 @@
#include "HandleStack.h"
#include "HeapRootVisitor.h"
+#include "JSCJSValueInlines.h"
#include "JSObject.h"
-#include "JSValueInlines.h"
namespace JSC {
diff --git a/Source/JavaScriptCore/heap/HandleTypes.h b/Source/JavaScriptCore/heap/HandleTypes.h
index bdfbcfd..42a267e 100644
--- a/Source/JavaScriptCore/heap/HandleTypes.h
+++ b/Source/JavaScriptCore/heap/HandleTypes.h
@@ -26,7 +26,7 @@
#ifndef HandleTypes_h
#define HandleTypes_h
-#include "JSValue.h"
+#include "JSCJSValue.h"
namespace JSC {
diff --git a/Source/JavaScriptCore/heap/WeakImpl.h b/Source/JavaScriptCore/heap/WeakImpl.h
index 9924923..9e38aa5 100644
--- a/Source/JavaScriptCore/heap/WeakImpl.h
+++ b/Source/JavaScriptCore/heap/WeakImpl.h
@@ -26,7 +26,7 @@
#ifndef WeakImpl_h
#define WeakImpl_h
-#include "JSValue.h"
+#include "JSCJSValue.h"
namespace JSC {
diff --git a/Source/JavaScriptCore/interpreter/Interpreter.h b/Source/JavaScriptCore/interpreter/Interpreter.h
index c3bca1a..eb080d1 100644
--- a/Source/JavaScriptCore/interpreter/Interpreter.h
+++ b/Source/JavaScriptCore/interpreter/Interpreter.h
@@ -31,9 +31,9 @@
#define Interpreter_h
#include "ArgList.h"
+#include "JSCJSValue.h"
#include "JSCell.h"
#include "JSFunction.h"
-#include "JSValue.h"
#include "JSObject.h"
#include "JSStack.h"
#include "LLIntData.h"
diff --git a/Source/JavaScriptCore/interpreter/Register.h b/Source/JavaScriptCore/interpreter/Register.h
index f056a1c..bc23356 100644
--- a/Source/JavaScriptCore/interpreter/Register.h
+++ b/Source/JavaScriptCore/interpreter/Register.h
@@ -29,7 +29,7 @@
#ifndef Register_h
#define Register_h
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include <wtf/Assertions.h>
#include <wtf/VectorTraits.h>
diff --git a/Source/JavaScriptCore/interpreter/VMInspector.h b/Source/JavaScriptCore/interpreter/VMInspector.h
index 81ca26c..6623068 100644
--- a/Source/JavaScriptCore/interpreter/VMInspector.h
+++ b/Source/JavaScriptCore/interpreter/VMInspector.h
@@ -29,7 +29,7 @@
#define ENABLE_VMINSPECTOR 0
#include "CallFrame.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include <stdarg.h>
#include <stdio.h>
#include <wtf/text/WTFString.h>
diff --git a/Source/JavaScriptCore/jit/HostCallReturnValue.cpp b/Source/JavaScriptCore/jit/HostCallReturnValue.cpp
index 967c499..528fb2b 100644
--- a/Source/JavaScriptCore/jit/HostCallReturnValue.cpp
+++ b/Source/JavaScriptCore/jit/HostCallReturnValue.cpp
@@ -27,9 +27,9 @@
#include "HostCallReturnValue.h"
#include "CallFrame.h"
-#include <wtf/InlineASM.h>
+#include "JSCJSValueInlines.h"
#include "JSObject.h"
-#include "JSValueInlines.h"
+#include <wtf/InlineASM.h>
namespace JSC {
diff --git a/Source/JavaScriptCore/jit/HostCallReturnValue.h b/Source/JavaScriptCore/jit/HostCallReturnValue.h
index 3f61179..f4c8bc7 100644
--- a/Source/JavaScriptCore/jit/HostCallReturnValue.h
+++ b/Source/JavaScriptCore/jit/HostCallReturnValue.h
@@ -26,7 +26,7 @@
#ifndef HostCallReturnValue_h
#define HostCallReturnValue_h
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include "MacroAssemblerCodeRef.h"
#include <wtf/Platform.h>
diff --git a/Source/JavaScriptCore/jit/JITCode.h b/Source/JavaScriptCore/jit/JITCode.h
index 78ae8ae..d55ac0b 100644
--- a/Source/JavaScriptCore/jit/JITCode.h
+++ b/Source/JavaScriptCore/jit/JITCode.h
@@ -30,7 +30,7 @@
#include "CallFrame.h"
#include "Disassembler.h"
#include "JITStubs.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include "LegacyProfiler.h"
#include "MacroAssemblerCodeRef.h"
#endif
diff --git a/Source/JavaScriptCore/jit/JITExceptions.cpp b/Source/JavaScriptCore/jit/JITExceptions.cpp
index c29e150..05ace83 100644
--- a/Source/JavaScriptCore/jit/JITExceptions.cpp
+++ b/Source/JavaScriptCore/jit/JITExceptions.cpp
@@ -29,8 +29,8 @@
#include "CallFrame.h"
#include "CodeBlock.h"
#include "Interpreter.h"
+#include "JSCJSValue.h"
#include "JSGlobalData.h"
-#include "JSValue.h"
#include "Operations.h"
#if ENABLE(JIT) || ENABLE(LLINT)
diff --git a/Source/JavaScriptCore/jit/JITExceptions.h b/Source/JavaScriptCore/jit/JITExceptions.h
index 1555f95..6921fe1 100644
--- a/Source/JavaScriptCore/jit/JITExceptions.h
+++ b/Source/JavaScriptCore/jit/JITExceptions.h
@@ -26,7 +26,7 @@
#ifndef JITExceptions_h
#define JITExceptions_h
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include "MacroAssemblerCodeRef.h"
#if ENABLE(JIT) || ENABLE(LLINT)
diff --git a/Source/JavaScriptCore/jit/JSInterfaceJIT.h b/Source/JavaScriptCore/jit/JSInterfaceJIT.h
index 2f4b4e3..7fdeaf0 100644
--- a/Source/JavaScriptCore/jit/JSInterfaceJIT.h
+++ b/Source/JavaScriptCore/jit/JSInterfaceJIT.h
@@ -29,9 +29,9 @@
#include "BytecodeConventions.h"
#include "JITCode.h"
#include "JITStubs.h"
+#include "JSCJSValue.h"
#include "JSStack.h"
#include "JSString.h"
-#include "JSValue.h"
#include "MacroAssembler.h"
#include <wtf/AlwaysInline.h>
#include <wtf/Vector.h>
diff --git a/Source/JavaScriptCore/llint/LLIntCLoop.h b/Source/JavaScriptCore/llint/LLIntCLoop.h
index 3a9c77b..231e52f 100644
--- a/Source/JavaScriptCore/llint/LLIntCLoop.h
+++ b/Source/JavaScriptCore/llint/LLIntCLoop.h
@@ -29,7 +29,7 @@
#if ENABLE(LLINT_C_LOOP)
#include "CodeSpecializationKind.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include "MacroAssemblerCodeRef.h"
#include "Opcode.h"
#include "Register.h"
diff --git a/Source/JavaScriptCore/llint/LLIntData.h b/Source/JavaScriptCore/llint/LLIntData.h
index 3b3b602..c04bebb 100644
--- a/Source/JavaScriptCore/llint/LLIntData.h
+++ b/Source/JavaScriptCore/llint/LLIntData.h
@@ -26,7 +26,7 @@
#ifndef LLIntData_h
#define LLIntData_h
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include "Opcode.h"
#include <wtf/Platform.h>
diff --git a/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp b/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
index 2cc1ed4..a69fec6 100644
--- a/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
+++ b/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
@@ -38,11 +38,11 @@
#include "JIT.h"
#include "JITDriver.h"
#include "JSActivation.h"
+#include "JSCJSValue.h"
#include "JSGlobalObjectFunctions.h"
#include "JSNameScope.h"
#include "JSPropertyNameIterator.h"
#include "JSString.h"
-#include "JSValue.h"
#include "JSWithScope.h"
#include "LLIntCommon.h"
#include "LLIntExceptions.h"
diff --git a/Source/JavaScriptCore/profiler/ProfilerBytecode.h b/Source/JavaScriptCore/profiler/ProfilerBytecode.h
index 57ae702..8e99c9a 100644
--- a/Source/JavaScriptCore/profiler/ProfilerBytecode.h
+++ b/Source/JavaScriptCore/profiler/ProfilerBytecode.h
@@ -26,7 +26,7 @@
#ifndef ProfilerBytecode_h
#define ProfilerBytecode_h
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include "Opcode.h"
#include <wtf/text/CString.h>
diff --git a/Source/JavaScriptCore/profiler/ProfilerBytecodeSequence.h b/Source/JavaScriptCore/profiler/ProfilerBytecodeSequence.h
index 2c99941..1d5c82a 100644
--- a/Source/JavaScriptCore/profiler/ProfilerBytecodeSequence.h
+++ b/Source/JavaScriptCore/profiler/ProfilerBytecodeSequence.h
@@ -26,7 +26,7 @@
#ifndef ProfilerBytecodeSequence_h
#define ProfilerBytecodeSequence_h
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include "ProfilerBytecode.h"
#include <wtf/PrintStream.h>
#include <wtf/Vector.h>
diff --git a/Source/JavaScriptCore/profiler/ProfilerBytecodes.h b/Source/JavaScriptCore/profiler/ProfilerBytecodes.h
index 96edcd5..47d856c 100644
--- a/Source/JavaScriptCore/profiler/ProfilerBytecodes.h
+++ b/Source/JavaScriptCore/profiler/ProfilerBytecodes.h
@@ -27,7 +27,7 @@
#define ProfilerBytecodes_h
#include "CodeBlockHash.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include "ProfilerBytecodeSequence.h"
#include <wtf/PrintStream.h>
#include <wtf/text/WTFString.h>
diff --git a/Source/JavaScriptCore/profiler/ProfilerCompilation.h b/Source/JavaScriptCore/profiler/ProfilerCompilation.h
index 70b8edc..607060e 100644
--- a/Source/JavaScriptCore/profiler/ProfilerCompilation.h
+++ b/Source/JavaScriptCore/profiler/ProfilerCompilation.h
@@ -27,7 +27,7 @@
#define ProfilerCompilation_h
#include "ExitKind.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include "ProfilerCompilationKind.h"
#include "ProfilerCompiledBytecode.h"
#include "ProfilerExecutionCounter.h"
diff --git a/Source/JavaScriptCore/profiler/ProfilerCompiledBytecode.h b/Source/JavaScriptCore/profiler/ProfilerCompiledBytecode.h
index 2bedf05..84044445 100644
--- a/Source/JavaScriptCore/profiler/ProfilerCompiledBytecode.h
+++ b/Source/JavaScriptCore/profiler/ProfilerCompiledBytecode.h
@@ -26,7 +26,7 @@
#ifndef ProfilerCompiledBytecode_h
#define ProfilerCompiledBytecode_h
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include "ProfilerOriginStack.h"
#include <wtf/text/CString.h>
diff --git a/Source/JavaScriptCore/profiler/ProfilerDatabase.h b/Source/JavaScriptCore/profiler/ProfilerDatabase.h
index e82f751..8d8dcff 100644
--- a/Source/JavaScriptCore/profiler/ProfilerDatabase.h
+++ b/Source/JavaScriptCore/profiler/ProfilerDatabase.h
@@ -26,7 +26,7 @@
#ifndef ProfilerDatabase_h
#define ProfilerDatabase_h
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include "ProfilerBytecodes.h"
#include "ProfilerCompilation.h"
#include "ProfilerCompilationKind.h"
diff --git a/Source/JavaScriptCore/profiler/ProfilerOSRExit.h b/Source/JavaScriptCore/profiler/ProfilerOSRExit.h
index b96d1d6..2a23d0b 100644
--- a/Source/JavaScriptCore/profiler/ProfilerOSRExit.h
+++ b/Source/JavaScriptCore/profiler/ProfilerOSRExit.h
@@ -27,7 +27,7 @@
#define ProfilerOSRExit_h
#include "ExitKind.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include "ProfilerOriginStack.h"
namespace JSC { namespace Profiler {
diff --git a/Source/JavaScriptCore/profiler/ProfilerOSRExitSite.h b/Source/JavaScriptCore/profiler/ProfilerOSRExitSite.h
index 0580de6..fa418e9 100644
--- a/Source/JavaScriptCore/profiler/ProfilerOSRExitSite.h
+++ b/Source/JavaScriptCore/profiler/ProfilerOSRExitSite.h
@@ -26,7 +26,7 @@
#ifndef ProfilerOSRExitSite_h
#define ProfilerOSRExitSite_h
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include <wtf/Vector.h>
namespace JSC { namespace Profiler {
diff --git a/Source/JavaScriptCore/profiler/ProfilerOrigin.h b/Source/JavaScriptCore/profiler/ProfilerOrigin.h
index 7d160f4..09b3884 100644
--- a/Source/JavaScriptCore/profiler/ProfilerOrigin.h
+++ b/Source/JavaScriptCore/profiler/ProfilerOrigin.h
@@ -27,7 +27,7 @@
#define ProfilerOrigin_h
#include "CodeBlockHash.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include <wtf/HashMap.h>
#include <wtf/PrintStream.h>
diff --git a/Source/JavaScriptCore/profiler/ProfilerOriginStack.h b/Source/JavaScriptCore/profiler/ProfilerOriginStack.h
index c680879..415e8d9 100644
--- a/Source/JavaScriptCore/profiler/ProfilerOriginStack.h
+++ b/Source/JavaScriptCore/profiler/ProfilerOriginStack.h
@@ -26,7 +26,7 @@
#ifndef ProfilerOriginStack_h
#define ProfilerOriginStack_h
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include "ProfilerOrigin.h"
#include <wtf/HashMap.h>
#include <wtf/PrintStream.h>
diff --git a/Source/JavaScriptCore/runtime/ArgList.cpp b/Source/JavaScriptCore/runtime/ArgList.cpp
index 194e515..7424041 100644
--- a/Source/JavaScriptCore/runtime/ArgList.cpp
+++ b/Source/JavaScriptCore/runtime/ArgList.cpp
@@ -22,7 +22,7 @@
#include "ArgList.h"
#include "HeapRootVisitor.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include "JSObject.h"
#include "Operations.h"
diff --git a/Source/JavaScriptCore/runtime/CachedTranscendentalFunction.h b/Source/JavaScriptCore/runtime/CachedTranscendentalFunction.h
index 62a01db..392d64f 100644
--- a/Source/JavaScriptCore/runtime/CachedTranscendentalFunction.h
+++ b/Source/JavaScriptCore/runtime/CachedTranscendentalFunction.h
@@ -26,7 +26,7 @@
#ifndef CachedTranscendentalFunction_h
#define CachedTranscendentalFunction_h
-#include "JSValue.h"
+#include "JSCJSValue.h"
namespace JSC {
diff --git a/Source/JavaScriptCore/runtime/CallData.h b/Source/JavaScriptCore/runtime/CallData.h
index 7df36c7..3bbac73 100644
--- a/Source/JavaScriptCore/runtime/CallData.h
+++ b/Source/JavaScriptCore/runtime/CallData.h
@@ -29,7 +29,7 @@
#ifndef CallData_h
#define CallData_h
-#include "JSValue.h"
+#include "JSCJSValue.h"
namespace JSC {
diff --git a/Source/JavaScriptCore/runtime/Completion.h b/Source/JavaScriptCore/runtime/Completion.h
index d150fce..5cc2d32 100644
--- a/Source/JavaScriptCore/runtime/Completion.h
+++ b/Source/JavaScriptCore/runtime/Completion.h
@@ -23,7 +23,7 @@
#ifndef Completion_h
#define Completion_h
-#include "JSValue.h"
+#include "JSCJSValue.h"
namespace JSC {
diff --git a/Source/JavaScriptCore/runtime/ConstructData.h b/Source/JavaScriptCore/runtime/ConstructData.h
index 6426b04..10317a2 100644
--- a/Source/JavaScriptCore/runtime/ConstructData.h
+++ b/Source/JavaScriptCore/runtime/ConstructData.h
@@ -30,7 +30,7 @@
#define ConstructData_h
#include "CallData.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
namespace JSC {
diff --git a/Source/JavaScriptCore/runtime/DateConstructor.cpp b/Source/JavaScriptCore/runtime/DateConstructor.cpp
index 6c8ae887..7e78211 100644
--- a/Source/JavaScriptCore/runtime/DateConstructor.cpp
+++ b/Source/JavaScriptCore/runtime/DateConstructor.cpp
@@ -25,12 +25,12 @@
#include "DateConversion.h"
#include "DateInstance.h"
#include "DatePrototype.h"
+#include "JSCJSValueInlines.h"
#include "JSDateMath.h"
#include "JSFunction.h"
#include "JSGlobalObject.h"
#include "JSString.h"
#include "JSStringBuilder.h"
-#include "JSValueInlines.h"
#include "ObjectPrototype.h"
#include <math.h>
#include <time.h>
diff --git a/Source/JavaScriptCore/runtime/DateInstance.cpp b/Source/JavaScriptCore/runtime/DateInstance.cpp
index bde416e..9df8220 100644
--- a/Source/JavaScriptCore/runtime/DateInstance.cpp
+++ b/Source/JavaScriptCore/runtime/DateInstance.cpp
@@ -22,9 +22,9 @@
#include "config.h"
#include "DateInstance.h"
+#include "JSCJSValueInlines.h"
#include "JSDateMath.h"
#include "JSGlobalObject.h"
-#include "JSValueInlines.h"
#include <math.h>
#include <wtf/MathExtras.h>
diff --git a/Source/JavaScriptCore/runtime/DatePrototype.cpp b/Source/JavaScriptCore/runtime/DatePrototype.cpp
index 2ec7bd4..24d1140 100644
--- a/Source/JavaScriptCore/runtime/DatePrototype.cpp
+++ b/Source/JavaScriptCore/runtime/DatePrototype.cpp
@@ -27,11 +27,11 @@
#include "DateConversion.h"
#include "DateInstance.h"
#include "Error.h"
+#include "JSCJSValueInlines.h"
#include "JSDateMath.h"
#include "JSGlobalObject.h"
#include "JSString.h"
#include "JSStringBuilder.h"
-#include "JSValueInlines.h"
#include "Lookup.h"
#include "ObjectPrototype.h"
diff --git a/Source/JavaScriptCore/runtime/JSAPIValueWrapper.h b/Source/JavaScriptCore/runtime/JSAPIValueWrapper.h
index 21d7b21..73965e8 100644
--- a/Source/JavaScriptCore/runtime/JSAPIValueWrapper.h
+++ b/Source/JavaScriptCore/runtime/JSAPIValueWrapper.h
@@ -23,8 +23,8 @@
#ifndef JSAPIValueWrapper_h
#define JSAPIValueWrapper_h
+#include "JSCJSValue.h"
#include "JSCell.h"
-#include "JSValue.h"
#include "CallFrame.h"
#include "Structure.h"
diff --git a/Source/JavaScriptCore/runtime/JSValue.cpp b/Source/JavaScriptCore/runtime/JSCJSValue.cpp
similarity index 99%
rename from Source/JavaScriptCore/runtime/JSValue.cpp
rename to Source/JavaScriptCore/runtime/JSCJSValue.cpp
index 846ddbc..8d56582d 100644
--- a/Source/JavaScriptCore/runtime/JSValue.cpp
+++ b/Source/JavaScriptCore/runtime/JSCJSValue.cpp
@@ -21,17 +21,17 @@
*/
#include "config.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include "BooleanConstructor.h"
#include "BooleanPrototype.h"
#include "Error.h"
#include "ExceptionHelpers.h"
#include "GetterSetter.h"
-#include "JSGlobalObject.h"
+#include "JSCJSValueInlines.h"
#include "JSFunction.h"
+#include "JSGlobalObject.h"
#include "JSNotAnObject.h"
-#include "JSValueInlines.h"
#include "NumberObject.h"
#include <wtf/MathExtras.h>
#include <wtf/StringExtras.h>
diff --git a/Source/JavaScriptCore/runtime/JSValue.h b/Source/JavaScriptCore/runtime/JSCJSValue.h
similarity index 96%
rename from Source/JavaScriptCore/runtime/JSValue.h
rename to Source/JavaScriptCore/runtime/JSCJSValue.h
index 602b0c6..1c58df2 100644
--- a/Source/JavaScriptCore/runtime/JSValue.h
+++ b/Source/JavaScriptCore/runtime/JSCJSValue.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef JSValue_h
-#define JSValue_h
+#ifndef JSCJSValue_h
+#define JSCJSValue_h
#include <math.h>
#include <stddef.h> // for size_t
@@ -245,12 +245,12 @@
JSObject* toThisObject(ExecState*) const;
- static bool equal(ExecState* exec, JSValue v1, JSValue v2);
- static bool equalSlowCase(ExecState* exec, JSValue v1, JSValue v2);
- static bool equalSlowCaseInline(ExecState* exec, JSValue v1, JSValue v2);
- static bool strictEqual(ExecState* exec, JSValue v1, JSValue v2);
- static bool strictEqualSlowCase(ExecState* exec, JSValue v1, JSValue v2);
- static bool strictEqualSlowCaseInline(ExecState* exec, JSValue v1, JSValue v2);
+ static bool equal(ExecState*, JSValue v1, JSValue v2);
+ static bool equalSlowCase(ExecState*, JSValue v1, JSValue v2);
+ static bool equalSlowCaseInline(ExecState*, JSValue v1, JSValue v2);
+ static bool strictEqual(ExecState*, JSValue v1, JSValue v2);
+ static bool strictEqualSlowCase(ExecState*, JSValue v1, JSValue v2);
+ static bool strictEqualSlowCaseInline(ExecState*, JSValue v1, JSValue v2);
bool isCell() const;
JSCell* asCell() const;
@@ -494,4 +494,4 @@
} // namespace JSC
-#endif // JSValue_h
+#endif // JSCJSValue_h
diff --git a/Source/JavaScriptCore/runtime/JSValueInlines.h b/Source/JavaScriptCore/runtime/JSCJSValueInlines.h
similarity index 99%
rename from Source/JavaScriptCore/runtime/JSValueInlines.h
rename to Source/JavaScriptCore/runtime/JSCJSValueInlines.h
index afae5d1..8ee70b4 100644
--- a/Source/JavaScriptCore/runtime/JSValueInlines.h
+++ b/Source/JavaScriptCore/runtime/JSCJSValueInlines.h
@@ -27,9 +27,9 @@
#define JSValueInlines_h
#include "InternalFunction.h"
+#include "JSCJSValue.h"
#include "JSCellInlines.h"
#include "JSFunction.h"
-#include "JSValue.h"
namespace JSC {
diff --git a/Source/JavaScriptCore/runtime/JSGlobalData.h b/Source/JavaScriptCore/runtime/JSGlobalData.h
index 3b02dc9..d85cfb2 100644
--- a/Source/JavaScriptCore/runtime/JSGlobalData.h
+++ b/Source/JavaScriptCore/runtime/JSGlobalData.h
@@ -36,8 +36,8 @@
#include "Intrinsic.h"
#include "JITThunks.h"
#include "JITThunks.h"
+#include "JSCJSValue.h"
#include "JSLock.h"
-#include "JSValue.h"
#include "LLIntData.h"
#include "NumericStrings.h"
#include "ProfilerDatabase.h"
diff --git a/Source/JavaScriptCore/runtime/JSGlobalObject.cpp b/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
index cb6747b..a509ecb 100644
--- a/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
+++ b/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
@@ -49,6 +49,7 @@
#include "Interpreter.h"
#include "JSActivation.h"
#include "JSBoundFunction.h"
+#include "JSCJSValueInlines.h"
#include "JSCallbackConstructor.h"
#include "JSCallbackFunction.h"
#include "JSCallbackObject.h"
@@ -57,7 +58,6 @@
#include "JSLock.h"
#include "JSNameScope.h"
#include "JSONObject.h"
-#include "JSValueInlines.h"
#include "JSWithScope.h"
#include "LegacyProfiler.h"
#include "Lookup.h"
diff --git a/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.h b/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.h
index 757c9dc..c2b4a1b 100644
--- a/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.h
+++ b/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.h
@@ -24,7 +24,7 @@
#ifndef JSGlobalObjectFunctions_h
#define JSGlobalObjectFunctions_h
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include <wtf/unicode/Unicode.h>
namespace JSC {
diff --git a/Source/JavaScriptCore/runtime/JSStringJoiner.h b/Source/JavaScriptCore/runtime/JSStringJoiner.h
index 5cb841a..6340cbf 100644
--- a/Source/JavaScriptCore/runtime/JSStringJoiner.h
+++ b/Source/JavaScriptCore/runtime/JSStringJoiner.h
@@ -26,7 +26,7 @@
#ifndef JSStringJoiner_h
#define JSStringJoiner_h
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include <wtf/Vector.h>
#include <wtf/text/WTFString.h>
diff --git a/Source/JavaScriptCore/runtime/LiteralParser.h b/Source/JavaScriptCore/runtime/LiteralParser.h
index c0f308e..fac9757 100644
--- a/Source/JavaScriptCore/runtime/LiteralParser.h
+++ b/Source/JavaScriptCore/runtime/LiteralParser.h
@@ -27,8 +27,8 @@
#define LiteralParser_h
#include "Identifier.h"
+#include "JSCJSValue.h"
#include "JSGlobalObjectFunctions.h"
-#include "JSValue.h"
#include <wtf/text/WTFString.h>
namespace JSC {
diff --git a/Source/JavaScriptCore/runtime/Operations.h b/Source/JavaScriptCore/runtime/Operations.h
index a901d3e..15c78b9 100644
--- a/Source/JavaScriptCore/runtime/Operations.h
+++ b/Source/JavaScriptCore/runtime/Operations.h
@@ -24,9 +24,9 @@
#include "ExceptionHelpers.h"
#include "Interpreter.h"
+#include "JSCJSValueInlines.h"
#include "JSProxy.h"
#include "JSString.h"
-#include "JSValueInlines.h"
namespace JSC {
diff --git a/Source/JavaScriptCore/runtime/PropertyDescriptor.h b/Source/JavaScriptCore/runtime/PropertyDescriptor.h
index 2c3878f..5a5857d 100644
--- a/Source/JavaScriptCore/runtime/PropertyDescriptor.h
+++ b/Source/JavaScriptCore/runtime/PropertyDescriptor.h
@@ -26,7 +26,7 @@
#ifndef PropertyDescriptor_h
#define PropertyDescriptor_h
-#include "JSValue.h"
+#include "JSCJSValue.h"
namespace JSC {
class GetterSetter;
diff --git a/Source/JavaScriptCore/runtime/PropertySlot.h b/Source/JavaScriptCore/runtime/PropertySlot.h
index c673eaa..6fb80d2 100644
--- a/Source/JavaScriptCore/runtime/PropertySlot.h
+++ b/Source/JavaScriptCore/runtime/PropertySlot.h
@@ -21,7 +21,7 @@
#ifndef PropertySlot_h
#define PropertySlot_h
-#include "JSValue.h"
+#include "JSCJSValue.h"
#include "PropertyName.h"
#include "PropertyOffset.h"
#include "Register.h"
diff --git a/Source/JavaScriptCore/runtime/Protect.h b/Source/JavaScriptCore/runtime/Protect.h
index 843c9e1..78dd319 100644
--- a/Source/JavaScriptCore/runtime/Protect.h
+++ b/Source/JavaScriptCore/runtime/Protect.h
@@ -23,7 +23,7 @@
#define Protect_h
#include "Heap.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
namespace JSC {
diff --git a/Source/JavaScriptCore/runtime/RegExpPrototype.cpp b/Source/JavaScriptCore/runtime/RegExpPrototype.cpp
index a14b375..d980171 100644
--- a/Source/JavaScriptCore/runtime/RegExpPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/RegExpPrototype.cpp
@@ -24,11 +24,11 @@
#include "ArrayPrototype.h"
#include "Error.h"
#include "JSArray.h"
+#include "JSCJSValue.h"
#include "JSFunction.h"
#include "JSObject.h"
#include "JSString.h"
#include "JSStringBuilder.h"
-#include "JSValue.h"
#include "ObjectPrototype.h"
#include "Operations.h"
#include "RegExpObject.h"
diff --git a/Source/JavaScriptCore/runtime/Structure.h b/Source/JavaScriptCore/runtime/Structure.h
index 6dca9b1..8b2fb7b 100644
--- a/Source/JavaScriptCore/runtime/Structure.h
+++ b/Source/JavaScriptCore/runtime/Structure.h
@@ -28,9 +28,9 @@
#include "ClassInfo.h"
#include "IndexingType.h"
+#include "JSCJSValue.h"
#include "JSCell.h"
#include "JSType.h"
-#include "JSValue.h"
#include "PropertyMapHashTable.h"
#include "PropertyName.h"
#include "PropertyNameArray.h"
