Changeset 220219 in webkit for trunk/Source/JavaScriptCore/ftl/FTLThunks.cpp

Timestamp:

Aug 3, 2017, 12:17:13 PM (8 years ago)

Author:

[email protected]

Message:

Rename ScratchBuffer::activeLengthPtr to addressOfActiveLength.
​https://bugs.webkit.org/show_bug.cgi?id=175142
<rdar://problem/33704528>

Reviewed by Filip Pizlo.

The convention in the rest of of JSC for such methods which return the address of
a field is to name them "addressOf<field name>". We'll rename
ScratchBuffer::activeLengthPtr to be consistent with this convention.

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::compileNewArrayWithSpread):

• dfg/DFGSpeculativeJIT32_64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

• dfg/DFGSpeculativeJIT64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

• dfg/DFGThunks.cpp:

(JSC::DFG::osrExitGenerationThunkGenerator):

• ftl/FTLLowerDFGToB3.cpp:

(JSC::FTL::DFG::LowerDFGToB3::compileNewArray):
(JSC::FTL::DFG::LowerDFGToB3::compileNewArrayWithSpread):

• ftl/FTLThunks.cpp:

(JSC::FTL::genericGenerationThunkGenerator):

• jit/AssemblyHelpers.cpp:

(JSC::AssemblyHelpers::debugCall):

• jit/ScratchRegisterAllocator.cpp:

(JSC::ScratchRegisterAllocator::preserveUsedRegistersToScratchBufferForCall):
(JSC::ScratchRegisterAllocator::restoreUsedRegistersFromScratchBufferForCall):

• runtime/VM.h:

(JSC::ScratchBuffer::addressOfActiveLength):
(JSC::ScratchBuffer::activeLengthPtr): Deleted.

• wasm/WasmBinding.cpp:

(JSC::Wasm::wasmToJs):

File:

• trunk/Source/JavaScriptCore/ftl/FTLThunks.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/ftl/FTLThunks.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2017 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -80 +80 @@
     
     // Tell GC mark phase how much of the scratch buffer is active during call.
-    jit.move(MacroAssembler::TrustedImmPtr(scratchBuffer->activeLengthPtr()), GPRInfo::nonArgGPR0);
+    jit.move(MacroAssembler::TrustedImmPtr(scratchBuffer->addressOfActiveLength()), GPRInfo::nonArgGPR0);
     jit.storePtr(MacroAssembler::TrustedImmPtr(requiredScratchMemorySizeInBytes()), GPRInfo::nonArgGPR0);
 
@@ -97 +97 @@
     
     // Make sure we tell the GC that we're not using the scratch buffer anymore.
-    jit.move(MacroAssembler::TrustedImmPtr(scratchBuffer->activeLengthPtr()), GPRInfo::regT1);
+    jit.move(MacroAssembler::TrustedImmPtr(scratchBuffer->addressOfActiveLength()), GPRInfo::regT1);
     jit.storePtr(MacroAssembler::TrustedImmPtr(0), GPRInfo::regT1);