Diff
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (194066 => 194067)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2015-12-14 23:10:22 UTC (rev 194066)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2015-12-14 23:18:36 UTC (rev 194067)
@@ -451,6 +451,7 @@
jit/ExecutableAllocator.cpp
jit/ExecutableAllocatorFixedVMPool.cpp
jit/GCAwareJITStubRoutine.cpp
+ jit/GPRInfo.cpp
jit/HostCallReturnValue.cpp
jit/IntrinsicEmitter.cpp
jit/JIT.cpp
Modified: trunk/Source/_javascript_Core/ChangeLog (194066 => 194067)
--- trunk/Source/_javascript_Core/ChangeLog 2015-12-14 23:10:22 UTC (rev 194066)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-12-14 23:18:36 UTC (rev 194067)
@@ -1,3 +1,20 @@
+2015-12-14 Filip Pizlo <fpi...@apple.com>
+
+ FTL B3 should do PutById
+ https://bugs.webkit.org/show_bug.cgi?id=152268
+
+ Reviewed by Saam Barati.
+
+ * CMakeLists.txt:
+ * _javascript_Core.xcodeproj/project.pbxproj:
+ * b3/B3LowerToAir.cpp:
+ (JSC::B3::Air::LowerToAir::createGenericCompare): I realized that we were missing some useful matching rules.
+ * b3/testb3.cpp: Added a bunch of tests.
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::compilePutById): Do the things.
+ * jit/GPRInfo.cpp: Added. I had to do this yucky thing because clang was having issues compiling references to this from deeply nested lambdas.
+ * jit/GPRInfo.h: Added a comment about how patchpointScratchRegister is bizarre and should probably die.
+
2015-12-14 Benjamin Poulain <bpoul...@apple.com>
[JSC] Add ceil() support for x86 and expose it to B3
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (194066 => 194067)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2015-12-14 23:10:22 UTC (rev 194066)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2015-12-14 23:18:36 UTC (rev 194067)
@@ -481,6 +481,7 @@
0F919D2515853CE0004A4E7D /* Watchpoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F919D2215853CDE004A4E7D /* Watchpoint.cpp */; };
0F919D2615853CE3004A4E7D /* Watchpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F919D2315853CDE004A4E7D /* Watchpoint.h */; settings = {ATTRIBUTES = (Private, ); }; };
0F919D2815856773004A4E7D /* SymbolTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F919D2715856770004A4E7D /* SymbolTable.cpp */; };
+ 0F93274D1C1F66AA00CF6564 /* GPRInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F93274C1C1F66AA00CF6564 /* GPRInfo.cpp */; };
0F93329D14CA7DC30085F3C6 /* CallLinkStatus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F93329314CA7DC10085F3C6 /* CallLinkStatus.cpp */; };
0F93329E14CA7DC50085F3C6 /* CallLinkStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F93329414CA7DC10085F3C6 /* CallLinkStatus.h */; settings = {ATTRIBUTES = (Private, ); }; };
0F93329F14CA7DCA0085F3C6 /* GetByIdStatus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F93329514CA7DC10085F3C6 /* GetByIdStatus.cpp */; };
@@ -2592,6 +2593,7 @@
0F919D2215853CDE004A4E7D /* Watchpoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Watchpoint.cpp; sourceTree = "<group>"; };
0F919D2315853CDE004A4E7D /* Watchpoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Watchpoint.h; sourceTree = "<group>"; };
0F919D2715856770004A4E7D /* SymbolTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SymbolTable.cpp; sourceTree = "<group>"; };
+ 0F93274C1C1F66AA00CF6564 /* GPRInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GPRInfo.cpp; sourceTree = "<group>"; };
0F93329314CA7DC10085F3C6 /* CallLinkStatus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CallLinkStatus.cpp; sourceTree = "<group>"; };
0F93329414CA7DC10085F3C6 /* CallLinkStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CallLinkStatus.h; sourceTree = "<group>"; };
0F93329514CA7DC10085F3C6 /* GetByIdStatus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GetByIdStatus.cpp; sourceTree = "<group>"; };
@@ -4892,6 +4894,7 @@
0F24E53E17EA9F5900ABB217 /* FPRInfo.h */,
0F766D2D15A8DCDD008F363E /* GCAwareJITStubRoutine.cpp */,
0F766D2E15A8DCDD008F363E /* GCAwareJITStubRoutine.h */,
+ 0F93274C1C1F66AA00CF6564 /* GPRInfo.cpp */,
0F24E53F17EA9F5900ABB217 /* GPRInfo.h */,
0F4680D014BBC5F800BFE272 /* HostCallReturnValue.cpp */,
0F4680D114BBC5F800BFE272 /* HostCallReturnValue.h */,
@@ -4904,11 +4907,11 @@
A75706DD118A2BCF0057F88F /* JITArithmetic32_64.cpp */,
FE3A06AD1C10CB6F00390FDD /* JITBitAndGenerator.cpp */,
FE3A06AE1C10CB6F00390FDD /* JITBitAndGenerator.h */,
+ FE3A06A71C10BC7400390FDD /* JITBitBinaryOpGenerator.h */,
FE3A06A31C10B70800390FDD /* JITBitOrGenerator.cpp */,
FE3A06A41C10B70800390FDD /* JITBitOrGenerator.h */,
FE3A06AF1C10CB6F00390FDD /* JITBitXorGenerator.cpp */,
FE3A06B01C10CB6F00390FDD /* JITBitXorGenerator.h */,
- FE3A06A71C10BC7400390FDD /* JITBitBinaryOpGenerator.h */,
86CC85A20EE79B7400288682 /* JITCall.cpp */,
146FE51111A710430087AE66 /* JITCall32_64.cpp */,
0F8F94431667635200D61971 /* JITCode.cpp */,
@@ -8755,6 +8758,7 @@
0FB105851675480F00F8AB6E /* ExitKind.cpp in Sources */,
0FEA0A1C1708B00700BB722C /* FTLAbstractHeap.cpp in Sources */,
0FEA0A1E1708B00700BB722C /* FTLAbstractHeapRepository.cpp in Sources */,
+ 0F93274D1C1F66AA00CF6564 /* GPRInfo.cpp in Sources */,
0F485327187DFDEC0083B687 /* FTLAvailableRecovery.cpp in Sources */,
0FEA0A09170513DB00BB722C /* FTLCapabilities.cpp in Sources */,
0F338E1B1BF286EA0013C88F /* B3BlockInsertionSet.cpp in Sources */,
Modified: trunk/Source/_javascript_Core/b3/B3LowerToAir.cpp (194066 => 194067)
--- trunk/Source/_javascript_Core/b3/B3LowerToAir.cpp 2015-12-14 23:10:22 UTC (rev 194066)
+++ trunk/Source/_javascript_Core/b3/B3LowerToAir.cpp 2015-12-14 23:18:36 UTC (rev 194067)
@@ -1131,6 +1131,15 @@
Arg::Width width = Arg::widthForB3Type(value->type());
Arg resCond = Arg::resCond(MacroAssembler::NonZero).inverted(inverted);
+ auto tryTest = [&] (
+ Arg::Width width, const ArgPromise& left, const ArgPromise& right) -> Inst {
+ if (Inst result = test(width, resCond, left, right))
+ return result;
+ if (Inst result = test(width, resCond, right, left))
+ return result;
+ return Inst();
+ };
+
auto attemptFused = [&] () -> Inst {
switch (value->opcode()) {
case NotEqual:
@@ -1165,15 +1174,6 @@
Arg leftImm = imm(left);
Arg rightImm = imm(right);
- auto tryTest = [&] (
- Arg::Width width, const ArgPromise& left, const ArgPromise& right) -> Inst {
- if (Inst result = test(width, resCond, left, right))
- return result;
- if (Inst result = test(width, resCond, right, left))
- return result;
- return Inst();
- };
-
auto tryTestLoadImm = [&] (Arg::Width width, B3::Opcode loadOpcode) -> Inst {
if (rightImm && rightImm.isRepresentableAs(width, Arg::Unsigned)) {
if (Inst result = tryTest(width, loadPromise(left, loadOpcode), rightImm)) {
@@ -1254,6 +1254,35 @@
}
}
+ if (canCommitInternal && value->as<MemoryValue>()) {
+ // Handle things like Branch(Load8Z(value))
+
+ if (Inst result = tryTest(Arg::Width8, loadPromise(value, Load8Z), Arg::imm(-1))) {
+ commitInternal(value);
+ return result;
+ }
+
+ if (Inst result = tryTest(Arg::Width8, loadPromise(value, Load8S), Arg::imm(-1))) {
+ commitInternal(value);
+ return result;
+ }
+
+ if (Inst result = tryTest(Arg::Width16, loadPromise(value, Load16Z), Arg::imm(-1))) {
+ commitInternal(value);
+ return result;
+ }
+
+ if (Inst result = tryTest(Arg::Width16, loadPromise(value, Load16S), Arg::imm(-1))) {
+ commitInternal(value);
+ return result;
+ }
+
+ if (Inst result = tryTest(width, loadPromise(value), Arg::imm(-1))) {
+ commitInternal(value);
+ return result;
+ }
+ }
+
if (Inst result = test(width, resCond, tmpPromise(value), Arg::imm(-1)))
return result;
Modified: trunk/Source/_javascript_Core/b3/testb3.cpp (194066 => 194067)
--- trunk/Source/_javascript_Core/b3/testb3.cpp 2015-12-14 23:10:22 UTC (rev 194066)
+++ trunk/Source/_javascript_Core/b3/testb3.cpp 2015-12-14 23:18:36 UTC (rev 194067)
@@ -5166,6 +5166,186 @@
CHECK(compileAndRun<int>(proc) == !value);
}
+void testBranchLoadPtr()
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(),
+ root->appendNew<MemoryValue>(
+ proc, Load, pointerType(), Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0)),
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ thenCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenCase->appendNew<Const32Value>(proc, Origin(), 1));
+
+ elseCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseCase->appendNew<Const32Value>(proc, Origin(), 0));
+
+ auto code = compile(proc);
+ intptr_t cond;
+ cond = 42;
+ CHECK(invoke<int>(*code, &cond) == 1);
+ cond = 0;
+ CHECK(invoke<int>(*code, &cond) == 0);
+}
+
+void testBranchLoad32()
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(),
+ root->appendNew<MemoryValue>(
+ proc, Load, Int32, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0)),
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ thenCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenCase->appendNew<Const32Value>(proc, Origin(), 1));
+
+ elseCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseCase->appendNew<Const32Value>(proc, Origin(), 0));
+
+ auto code = compile(proc);
+ int32_t cond;
+ cond = 42;
+ CHECK(invoke<int>(*code, &cond) == 1);
+ cond = 0;
+ CHECK(invoke<int>(*code, &cond) == 0);
+}
+
+void testBranchLoad8S()
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(),
+ root->appendNew<MemoryValue>(
+ proc, Load8S, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0)),
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ thenCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenCase->appendNew<Const32Value>(proc, Origin(), 1));
+
+ elseCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseCase->appendNew<Const32Value>(proc, Origin(), 0));
+
+ auto code = compile(proc);
+ int8_t cond;
+ cond = -1;
+ CHECK(invoke<int>(*code, &cond) == 1);
+ cond = 0;
+ CHECK(invoke<int>(*code, &cond) == 0);
+}
+
+void testBranchLoad8Z()
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(),
+ root->appendNew<MemoryValue>(
+ proc, Load8Z, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0)),
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ thenCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenCase->appendNew<Const32Value>(proc, Origin(), 1));
+
+ elseCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseCase->appendNew<Const32Value>(proc, Origin(), 0));
+
+ auto code = compile(proc);
+ uint8_t cond;
+ cond = 1;
+ CHECK(invoke<int>(*code, &cond) == 1);
+ cond = 0;
+ CHECK(invoke<int>(*code, &cond) == 0);
+}
+
+void testBranchLoad16S()
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(),
+ root->appendNew<MemoryValue>(
+ proc, Load16S, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0)),
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ thenCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenCase->appendNew<Const32Value>(proc, Origin(), 1));
+
+ elseCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseCase->appendNew<Const32Value>(proc, Origin(), 0));
+
+ auto code = compile(proc);
+ int16_t cond;
+ cond = -1;
+ CHECK(invoke<int>(*code, &cond) == 1);
+ cond = 0;
+ CHECK(invoke<int>(*code, &cond) == 0);
+}
+
+void testBranchLoad16Z()
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenCase = proc.addBlock();
+ BasicBlock* elseCase = proc.addBlock();
+
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(),
+ root->appendNew<MemoryValue>(
+ proc, Load16Z, Origin(),
+ root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0)),
+ FrequentedBlock(thenCase), FrequentedBlock(elseCase));
+
+ thenCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenCase->appendNew<Const32Value>(proc, Origin(), 1));
+
+ elseCase->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseCase->appendNew<Const32Value>(proc, Origin(), 0));
+
+ auto code = compile(proc);
+ uint16_t cond;
+ cond = 1;
+ CHECK(invoke<int>(*code, &cond) == 1);
+ cond = 0;
+ CHECK(invoke<int>(*code, &cond) == 0);
+}
+
void testComplex(unsigned numVars, unsigned numConstructs)
{
double before = monotonicallyIncreasingTimeMS();
@@ -8914,6 +9094,12 @@
RUN(testBranchNotEqualFoldPtr(0));
RUN(testBranchEqualFoldPtr(42));
RUN(testBranchEqualFoldPtr(0));
+ RUN(testBranchLoadPtr());
+ RUN(testBranchLoad32());
+ RUN(testBranchLoad8S());
+ RUN(testBranchLoad8Z());
+ RUN(testBranchLoad16S());
+ RUN(testBranchLoad16Z());
RUN(testComplex(64, 128));
RUN(testComplex(64, 256));
Modified: trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp (194066 => 194067)
--- trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp 2015-12-14 23:10:22 UTC (rev 194066)
+++ trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp 2015-12-14 23:18:36 UTC (rev 194067)
@@ -2472,17 +2472,66 @@
void compilePutById()
{
+ Node* node = m_node;
+
// See above; CellUse is easier so we do only that for now.
- ASSERT(m_node->child1().useKind() == CellUse);
+ ASSERT(node->child1().useKind() == CellUse);
+ LValue base = lowCell(node->child1());
+ LValue value = lowJSValue(node->child2());
+ auto uid = m_graph.identifiers()[node->identifierNumber()];
+
#if FTL_USES_B3
- if (verboseCompilationEnabled() || !verboseCompilationEnabled())
- CRASH();
+ // FIXME: Make this do exceptions.
+ // https://bugs.webkit.org/show_bug.cgi?id=151686
+
+ B3::PatchpointValue* patchpoint = m_out.patchpoint(Void);
+ patchpoint->append(base, ValueRep::SomeRegister);
+ patchpoint->append(value, ValueRep::SomeRegister);
+ patchpoint->clobber(RegisterSet::macroScratchRegisters());
+
+ State* state = &m_ftlState;
+ ECMAMode ecmaMode = m_graph.executableFor(node->origin.semantic)->ecmaMode();
+
+ patchpoint->setGenerator(
+ [=] (CCallHelpers& jit, const StackmapGenerationParams& params) {
+ AllowMacroScratchRegisterUsage allowScratch(jit);
+
+ auto generator = Box<JITPutByIdGenerator>::create(
+ jit.codeBlock(), node->origin.semantic,
+ state->jitCode->common.addUniqueCallSiteIndex(node->origin.semantic),
+ params.usedRegisters(), JSValueRegs(params[0].gpr()), JSValueRegs(params[1].gpr()),
+ GPRInfo::patchpointScratchRegister, ecmaMode,
+ node->op() == PutByIdDirect ? Direct : NotDirect);
+
+ generator->generateFastPath(jit);
+ CCallHelpers::Label done = jit.label();
+
+ params.addLatePath(
+ [=] (CCallHelpers& jit) {
+ AllowMacroScratchRegisterUsage allowScratch(jit);
+
+ // FIXME: Make this do something.
+ CCallHelpers::JumpList exceptions;
+
+ generator->slowPathJump().link(&jit);
+ CCallHelpers::Label slowPathBegin = jit.label();
+ CCallHelpers::Call slowPathCall = callOperation(
+ *state, params.usedRegisters(), jit, node->origin.semantic, &exceptions,
+ generator->slowPathFunction(), InvalidGPRReg,
+ CCallHelpers::TrustedImmPtr(generator->stubInfo()), params[1].gpr(),
+ params[0].gpr(), CCallHelpers::TrustedImmPtr(uid)).call();
+ jit.jump().linkTo(done, &jit);
+
+ generator->reportSlowPathCall(slowPathBegin, slowPathCall);
+
+ jit.addLinkTask(
+ [=] (LinkBuffer& linkBuffer) {
+ generator->finalize(linkBuffer);
+ });
+ });
+ });
#else
- LValue base = lowCell(m_node->child1());
- LValue value = lowJSValue(m_node->child2());
- auto uid = m_graph.identifiers()[m_node->identifierNumber()];
-
// Arguments: id, bytes, target, numArgs, args...
unsigned stackmapID = m_stackmapIDs++;
@@ -2504,9 +2553,9 @@
setInstructionCallingConvention(call, LLVMAnyRegCallConv);
m_ftlState.putByIds.append(PutByIdDescriptor(
- stackmapID, m_node->origin.semantic, uid,
- m_graph.executableFor(m_node->origin.semantic)->ecmaMode(),
- m_node->op() == PutByIdDirect ? Direct : NotDirect));
+ stackmapID, node->origin.semantic, uid,
+ m_graph.executableFor(node->origin.semantic)->ecmaMode(),
+ node->op() == PutByIdDirect ? Direct : NotDirect));
#endif
}
Added: trunk/Source/_javascript_Core/jit/GPRInfo.cpp (0 => 194067)
--- trunk/Source/_javascript_Core/jit/GPRInfo.cpp (rev 0)
+++ trunk/Source/_javascript_Core/jit/GPRInfo.cpp 2015-12-14 23:18:36 UTC (rev 194067)
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "GPRInfo.h"
+
+namespace JSC {
+
+#if CPU(X86_64)
+// This is in the .cpp file to work around clang issues.
+const GPRReg GPRInfo::patchpointScratchRegister = MacroAssembler::s_scratchRegister;
+#endif
+
+} // namespace JSC
+
Modified: trunk/Source/_javascript_Core/jit/GPRInfo.h (194066 => 194067)
--- trunk/Source/_javascript_Core/jit/GPRInfo.h 2015-12-14 23:10:22 UTC (rev 194066)
+++ trunk/Source/_javascript_Core/jit/GPRInfo.h 2015-12-14 23:18:36 UTC (rev 194067)
@@ -453,8 +453,12 @@
static const GPRReg returnValueGPR2 = X86Registers::edx; // regT1 or regT2
static const GPRReg nonPreservedNonReturnGPR = X86Registers::r10; // regT5 (regT4 on Windows)
static const GPRReg nonPreservedNonArgumentGPR = X86Registers::r10; // regT5 (regT4 on Windows)
- static const GPRReg patchpointScratchRegister = MacroAssembler::s_scratchRegister;
+ // FIXME: I believe that all uses of this are dead in the sense that it just causes the scratch
+ // register allocator to select a different register and potentially spill things. It would be better
+ // if we instead had a more explicit way of saying that we don't have a scratch register.
+ static const GPRReg patchpointScratchRegister;
+
static GPRReg toRegister(unsigned index)
{
ASSERT(index < numberOfRegisters);
