Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (192560 => 192561)
--- trunk/Source/_javascript_Core/ChangeLog 2015-11-18 01:34:49 UTC (rev 192560)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-11-18 01:53:44 UTC (rev 192561)
@@ -1,3 +1,35 @@
+2015-11-17 Benjamin Poulain <bpoul...@apple.com>
+
+ [JSC] Untangle the dependencies on FTLAbbreviations a bit
+ https://bugs.webkit.org/show_bug.cgi?id=151375
+
+ Reviewed by Geoffrey Garen.
+
+ FTLAbbreviations was included in many places but in most cases
+ we just need the Abbreviated types. Update the #include accordingly.
+
+ Also remove the IntrinsicRepository dependency from the B3Output.
+
+ * ftl/FTLAbstractHeap.cpp:
+ * ftl/FTLAbstractHeap.h:
+ * ftl/FTLAbstractHeapRepository.cpp:
+ * ftl/FTLB3Output.h:
+ (JSC::FTL::Output::Output):
+ (JSC::FTL::Output::stackmapIntrinsic):
+ (JSC::FTL::Output::frameAddressIntrinsic):
+ (JSC::FTL::Output::patchpointInt64Intrinsic):
+ (JSC::FTL::Output::patchpointVoidIntrinsic):
+ * ftl/FTLCommonValues.cpp:
+ * ftl/FTLCommonValues.h:
+ * ftl/FTLFormattedValue.h:
+ * ftl/FTLIntrinsicRepository.cpp:
+ * ftl/FTLOSRExit.h:
+ * ftl/FTLOSRExitCompilationInfo.h:
+ * ftl/FTLStackmapArgumentList.h:
+ * ftl/FTLState.cpp:
+ * ftl/FTLState.h:
+ * ftl/FTLTypedPointer.h:
+
2015-11-17 Filip Pizlo <fpi...@apple.com>
B3::generate should separate out the final Air codegen, so that it can be done outside the Graph safepoint
Modified: trunk/Source/_javascript_Core/ftl/FTLAbstractHeap.cpp (192560 => 192561)
--- trunk/Source/_javascript_Core/ftl/FTLAbstractHeap.cpp 2015-11-18 01:34:49 UTC (rev 192560)
+++ trunk/Source/_javascript_Core/ftl/FTLAbstractHeap.cpp 2015-11-18 01:53:44 UTC (rev 192561)
@@ -29,6 +29,7 @@
#if ENABLE(FTL_JIT)
#include "DFGCommon.h"
+#include "FTLAbbreviatedTypes.h"
#include "FTLAbbreviations.h"
#include "FTLAbstractHeapRepository.h"
#include "FTLB3Output.h"
Modified: trunk/Source/_javascript_Core/ftl/FTLAbstractHeap.h (192560 => 192561)
--- trunk/Source/_javascript_Core/ftl/FTLAbstractHeap.h 2015-11-18 01:34:49 UTC (rev 192560)
+++ trunk/Source/_javascript_Core/ftl/FTLAbstractHeap.h 2015-11-18 01:53:44 UTC (rev 192561)
@@ -28,7 +28,7 @@
#if ENABLE(FTL_JIT)
-#include "FTLAbbreviations.h"
+#include "FTLAbbreviatedTypes.h"
#include "JSCJSValue.h"
#include <array>
#include <wtf/FastMalloc.h>
Modified: trunk/Source/_javascript_Core/ftl/FTLAbstractHeapRepository.cpp (192560 => 192561)
--- trunk/Source/_javascript_Core/ftl/FTLAbstractHeapRepository.cpp 2015-11-18 01:34:49 UTC (rev 192560)
+++ trunk/Source/_javascript_Core/ftl/FTLAbstractHeapRepository.cpp 2015-11-18 01:53:44 UTC (rev 192561)
@@ -29,6 +29,7 @@
#if ENABLE(FTL_JIT)
#include "DirectArguments.h"
+#include "FTLAbbreviations.h"
#include "GetterSetter.h"
#include "JSArrowFunction.h"
#include "JSEnvironmentRecord.h"
Modified: trunk/Source/_javascript_Core/ftl/FTLB3Output.h (192560 => 192561)
--- trunk/Source/_javascript_Core/ftl/FTLB3Output.h 2015-11-18 01:34:49 UTC (rev 192560)
+++ trunk/Source/_javascript_Core/ftl/FTLB3Output.h 2015-11-18 01:53:44 UTC (rev 192561)
@@ -30,10 +30,9 @@
#if FTL_USES_B3
#include "DFGCommon.h"
-#include "FTLAbbreviations.h"
+#include "FTLAbbreviatedTypes.h"
#include "FTLAbstractHeapRepository.h"
#include "FTLCommonValues.h"
-#include "FTLIntrinsicRepository.h"
#include "FTLState.h"
#include "FTLSwitchCase.h"
#include "FTLTypedPointer.h"
@@ -52,10 +51,10 @@
enum Scale { ScaleOne, ScaleTwo, ScaleFour, ScaleEight, ScalePtr };
-class Output : public IntrinsicRepository {
+class Output : public CommonValues {
public:
Output(LContext context)
- : IntrinsicRepository(context)
+ : CommonValues(context)
{
CRASH();
}
@@ -301,6 +300,15 @@
ValueFromBlock anchor(LValue value) { CRASH(); }
+#pragma mark - Intrinsics
+
+ LValue stackmapIntrinsic() { CRASH(); }
+ LValue frameAddressIntrinsic() { CRASH(); }
+ LValue patchpointInt64Intrinsic() { CRASH(); }
+ LValue patchpointVoidIntrinsic() { CRASH(); }
+
+#pragma mark - States
+
LBasicBlock m_block;
LBasicBlock m_nextBlock;
};
Modified: trunk/Source/_javascript_Core/ftl/FTLCommonValues.cpp (192560 => 192561)
--- trunk/Source/_javascript_Core/ftl/FTLCommonValues.cpp 2015-11-18 01:34:49 UTC (rev 192560)
+++ trunk/Source/_javascript_Core/ftl/FTLCommonValues.cpp 2015-11-18 01:53:44 UTC (rev 192561)
@@ -26,6 +26,8 @@
#include "config.h"
#include "FTLCommonValues.h"
+#include "FTLAbbreviations.h"
+
#if ENABLE(FTL_JIT)
namespace JSC { namespace FTL {
Modified: trunk/Source/_javascript_Core/ftl/FTLCommonValues.h (192560 => 192561)
--- trunk/Source/_javascript_Core/ftl/FTLCommonValues.h 2015-11-18 01:34:49 UTC (rev 192560)
+++ trunk/Source/_javascript_Core/ftl/FTLCommonValues.h 2015-11-18 01:53:44 UTC (rev 192561)
@@ -28,7 +28,7 @@
#if ENABLE(FTL_JIT)
-#include "FTLAbbreviations.h"
+#include "FTLAbbreviatedTypes.h"
#include "FTLValueRange.h"
namespace JSC { namespace FTL {
Modified: trunk/Source/_javascript_Core/ftl/FTLFormattedValue.h (192560 => 192561)
--- trunk/Source/_javascript_Core/ftl/FTLFormattedValue.h 2015-11-18 01:34:49 UTC (rev 192560)
+++ trunk/Source/_javascript_Core/ftl/FTLFormattedValue.h 2015-11-18 01:53:44 UTC (rev 192561)
@@ -29,7 +29,7 @@
#if ENABLE(FTL_JIT)
#include "DataFormat.h"
-#include "FTLAbbreviations.h"
+#include "FTLAbbreviatedTypes.h"
namespace JSC { namespace FTL {
Modified: trunk/Source/_javascript_Core/ftl/FTLIntrinsicRepository.cpp (192560 => 192561)
--- trunk/Source/_javascript_Core/ftl/FTLIntrinsicRepository.cpp 2015-11-18 01:34:49 UTC (rev 192560)
+++ trunk/Source/_javascript_Core/ftl/FTLIntrinsicRepository.cpp 2015-11-18 01:53:44 UTC (rev 192561)
@@ -28,6 +28,8 @@
#if ENABLE(FTL_JIT)
+#include "FTLAbbreviations.h"
+
namespace JSC { namespace FTL {
IntrinsicRepository::IntrinsicRepository(LContext context)
Modified: trunk/Source/_javascript_Core/ftl/FTLOSRExit.h (192560 => 192561)
--- trunk/Source/_javascript_Core/ftl/FTLOSRExit.h 2015-11-18 01:34:49 UTC (rev 192560)
+++ trunk/Source/_javascript_Core/ftl/FTLOSRExit.h 2015-11-18 01:53:44 UTC (rev 192561)
@@ -31,7 +31,7 @@
#include "CodeOrigin.h"
#include "DFGExitProfile.h"
#include "DFGOSRExitBase.h"
-#include "FTLAbbreviations.h"
+#include "FTLAbbreviatedTypes.h"
#include "FTLExitTimeObjectMaterialization.h"
#include "FTLExitValue.h"
#include "FTLFormattedValue.h"
Modified: trunk/Source/_javascript_Core/ftl/FTLOSRExitCompilationInfo.h (192560 => 192561)
--- trunk/Source/_javascript_Core/ftl/FTLOSRExitCompilationInfo.h 2015-11-18 01:34:49 UTC (rev 192560)
+++ trunk/Source/_javascript_Core/ftl/FTLOSRExitCompilationInfo.h 2015-11-18 01:53:44 UTC (rev 192561)
@@ -28,7 +28,7 @@
#if ENABLE(FTL_JIT)
-#include "FTLAbbreviations.h"
+#include "FTLAbbreviatedTypes.h"
#include "MacroAssembler.h"
namespace JSC { namespace FTL {
Modified: trunk/Source/_javascript_Core/ftl/FTLStackmapArgumentList.h (192560 => 192561)
--- trunk/Source/_javascript_Core/ftl/FTLStackmapArgumentList.h 2015-11-18 01:34:49 UTC (rev 192560)
+++ trunk/Source/_javascript_Core/ftl/FTLStackmapArgumentList.h 2015-11-18 01:53:44 UTC (rev 192561)
@@ -28,7 +28,7 @@
#if ENABLE(FTL_JIT)
-#include "FTLAbbreviations.h"
+#include "FTLAbbreviatedTypes.h"
#include <wtf/Vector.h>
namespace JSC { namespace FTL {
Modified: trunk/Source/_javascript_Core/ftl/FTLState.cpp (192560 => 192561)
--- trunk/Source/_javascript_Core/ftl/FTLState.cpp 2015-11-18 01:34:49 UTC (rev 192560)
+++ trunk/Source/_javascript_Core/ftl/FTLState.cpp 2015-11-18 01:53:44 UTC (rev 192561)
@@ -29,6 +29,7 @@
#if ENABLE(FTL_JIT)
#include "CodeBlockWithJITType.h"
+#include "FTLAbbreviations.h"
#include "FTLForOSREntryJITCode.h"
#include "FTLJITCode.h"
#include "FTLJITFinalizer.h"
Modified: trunk/Source/_javascript_Core/ftl/FTLState.h (192560 => 192561)
--- trunk/Source/_javascript_Core/ftl/FTLState.h 2015-11-18 01:34:49 UTC (rev 192560)
+++ trunk/Source/_javascript_Core/ftl/FTLState.h 2015-11-18 01:53:44 UTC (rev 192561)
@@ -31,7 +31,7 @@
#include "B3Procedure.h"
#include "DFGCommon.h"
#include "DFGGraph.h"
-#include "FTLAbbreviations.h"
+#include "FTLAbbreviatedTypes.h"
#include "FTLGeneratedFunction.h"
#include "FTLInlineCacheDescriptor.h"
#include "FTLJITCode.h"
Modified: trunk/Source/_javascript_Core/ftl/FTLTypedPointer.h (192560 => 192561)
--- trunk/Source/_javascript_Core/ftl/FTLTypedPointer.h 2015-11-18 01:34:49 UTC (rev 192560)
+++ trunk/Source/_javascript_Core/ftl/FTLTypedPointer.h 2015-11-18 01:53:44 UTC (rev 192561)
@@ -28,7 +28,7 @@
#if ENABLE(FTL_JIT)
-#include "FTLAbbreviations.h"
+#include "FTLAbbreviatedTypes.h"
#include "FTLAbstractHeap.h"
namespace JSC { namespace FTL {
