Skip to content

Commit 8e18e98

Browse files
apple-opensourceapple-opensource
committed
7611.2.7.1.4
1 parent e8b96a8 commit 8e18e98

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1017
-172
lines changed

‎ChangeLog‎

Lines changed: 774 additions & 0 deletions
Large diffs are not rendered by default.

‎Configurations/Version.xcconfig‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2323

2424
MAJOR_VERSION = 611;
25-
MINOR_VERSION = 1;
26-
TINY_VERSION = 21;
27-
MICRO_VERSION = 161;
28-
NANO_VERSION = 3;
25+
MINOR_VERSION = 2;
26+
TINY_VERSION = 7;
27+
MICRO_VERSION = 1;
28+
NANO_VERSION = 4;
2929
FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
3030

3131
// The bundle version and short version string are set based on the current build configuration, see below.

‎Scripts/tests/builtins/expected/WebCoreJSBuiltins.h-result‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,10 @@ void JSBuiltinInternalFunctions::visit(JSC::SlotVisitor& visitor)
300300
UNUSED_PARAM(visitor);
301301
}
302302

303-
void JSBuiltinInternalFunctions::initialize(JSDOMGlobalObject& globalObject)
303+
SUPRESS_ASAN void JSBuiltinInternalFunctions::initialize(JSDOMGlobalObject& globalObject)
304+
template void JSBuiltinInternalFunctions::visit(AbstractSlotVisitor&);
305+
template void JSBuiltinInternalFunctions::visit(SlotVisitor&);
306+
304307
{
305308
UNUSED_PARAM(globalObject);
306309
#if ENABLE(FETCH_API)

‎Scripts/wkbuiltins/builtins_generate_internals_wrapper_implementation.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def _generate_initialize_static_globals(self):
140140
return '\n'.join(lines)
141141

142142
def generate_initialize_method(self):
143-
lines = ["void JSBuiltinInternalFunctions::initialize(JSDOMGlobalObject& globalObject)",
143+
lines = ["SUPPRESS_ASAN void JSBuiltinInternalFunctions::initialize(JSDOMGlobalObject& globalObject)",
144144
"{",
145145
" UNUSED_PARAM(globalObject);"]
146146

‎b3/B3ReduceStrength.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,10 +240,11 @@ class IntRange {
240240
T newMin = static_cast<T>(m_min) << static_cast<T>(shiftAmount);
241241
T newMax = static_cast<T>(m_max) << static_cast<T>(shiftAmount);
242242

243-
if ((newMin >> shiftAmount) != static_cast<T>(m_min))
243+
if (((newMin >> shiftAmount) != static_cast<T>(m_min))
244+
|| ((newMax >> shiftAmount) != static_cast<T>(m_max))) {
244245
newMin = std::numeric_limits<T>::min();
245-
if ((newMax >> shiftAmount) != static_cast<T>(m_max))
246246
newMax = std::numeric_limits<T>::max();
247+
}
247248

248249
return IntRange(newMin, newMax);
249250
}

‎bytecode/CodeBlock.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,7 @@ void CodeBlock::setAlternative(VM& vm, CodeBlock* alternative)
967967
m_alternative.set(vm, this, alternative);
968968
}
969969

970-
void CodeBlock::setNumParameters(int newValue)
970+
void CodeBlock::setNumParameters(unsigned newValue)
971971
{
972972
m_numParameters = newValue;
973973

@@ -1989,7 +1989,7 @@ void CodeBlock::ensureCatchLivenessIsComputedForBytecodeIndexSlow(const OpCatch&
19891989
liveOperands.append(virtualRegisterForLocal(liveLocal));
19901990
});
19911991

1992-
for (int i = 0; i < numParameters(); ++i)
1992+
for (unsigned i = 0; i < numParameters(); ++i)
19931993
liveOperands.append(virtualRegisterForArgumentIncludingThis(i));
19941994

19951995
auto profiles = makeUnique<ValueProfileAndVirtualRegisterBuffer>(liveOperands.size());
@@ -3161,7 +3161,9 @@ SpeculatedType CodeBlock::valueProfilePredictionForBytecodeIndex(const Concurren
31613161

31623162
ValueProfile& CodeBlock::valueProfileForBytecodeIndex(BytecodeIndex bytecodeIndex)
31633163
{
3164-
return *tryGetValueProfileForBytecodeIndex(bytecodeIndex);
3164+
ValueProfile* profile = tryGetValueProfileForBytecodeIndex(bytecodeIndex);
3165+
ASSERT(profile);
3166+
return *profile;
31653167
}
31663168

31673169
void CodeBlock::validate()

‎bytecode/CodeBlock.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -156,17 +156,17 @@ class CodeBlock : public JSCell {
156156

157157
MetadataTable* metadataTable() const { return m_metadata.get(); }
158158

159-
int numParameters() const { return m_numParameters; }
160-
void setNumParameters(int newValue);
159+
unsigned numParameters() const { return m_numParameters; }
160+
void setNumParameters(unsigned newValue);
161161

162-
int numberOfArgumentsToSkip() const { return m_numberOfArgumentsToSkip; }
162+
unsigned numberOfArgumentsToSkip() const { return m_numberOfArgumentsToSkip; }
163163

164-
int numCalleeLocals() const { return m_numCalleeLocals; }
164+
unsigned numCalleeLocals() const { return m_numCalleeLocals; }
165165

166-
int numVars() const { return m_numVars; }
167-
int numTmps() const { return m_unlinkedCode->hasCheckpoints() * maxNumCheckpointTmps; }
166+
unsigned numVars() const { return m_numVars; }
167+
unsigned numTmps() const { return m_unlinkedCode->hasCheckpoints() * maxNumCheckpointTmps; }
168168

169-
int* addressOfNumParameters() { return &m_numParameters; }
169+
unsigned* addressOfNumParameters() { return &m_numParameters; }
170170
static ptrdiff_t offsetOfNumParameters() { return OBJECT_OFFSETOF(CodeBlock, m_numParameters); }
171171

172172
CodeBlock* alternative() const { return static_cast<CodeBlock*>(m_alternative.get()); }
@@ -243,7 +243,7 @@ class CodeBlock : public JSCell {
243243

244244
ALWAYS_INLINE bool isTemporaryRegister(VirtualRegister reg)
245245
{
246-
return reg.offset() >= m_numVars;
246+
return reg.offset() >= static_cast<int>(m_numVars);
247247
}
248248

249249
HandlerInfo* handlerForBytecodeIndex(BytecodeIndex, RequiredHandler = RequiredHandler::AnyHandler);
@@ -995,10 +995,10 @@ class CodeBlock : public JSCell {
995995
void insertBasicBlockBoundariesForControlFlowProfiler();
996996
void ensureCatchLivenessIsComputedForBytecodeIndexSlow(const OpCatch&, BytecodeIndex);
997997

998-
int m_numCalleeLocals;
999-
int m_numVars;
1000-
int m_numParameters;
1001-
int m_numberOfArgumentsToSkip { 0 };
998+
unsigned m_numCalleeLocals;
999+
unsigned m_numVars;
1000+
unsigned m_numParameters;
1001+
unsigned m_numberOfArgumentsToSkip { 0 };
10021002
unsigned m_numberOfNonArgumentValueProfiles { 0 };
10031003
union {
10041004
unsigned m_debuggerRequests;

‎bytecode/Opcode.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ static constexpr unsigned bitWidthForMaxOpcodeLength = WTF::getMSBSetConstexpr(m
124124
macro(OpBitxor) \
125125
macro(OpLshift) \
126126
macro(OpRshift) \
127+
macro(OpGetPrivateName) \
127128

128129
#define FOR_EACH_OPCODE_WITH_ARRAY_PROFILE(macro) \
129130
macro(OpHasEnumerableIndexedProperty) \

‎bytecode/UnlinkedCodeBlock.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ class UnlinkedCodeBlock : public JSCell {
180180

181181
const InstructionStream& instructions() const;
182182

183-
int numCalleeLocals() const { return m_numCalleeLocals; }
184-
int numVars() const { return m_numVars; }
183+
unsigned numCalleeLocals() const { return m_numCalleeLocals; }
184+
unsigned numVars() const { return m_numVars; }
185185

186186
// Jump Tables
187187

@@ -360,9 +360,9 @@ class UnlinkedCodeBlock : public JSCell {
360360
unsigned m_lineCount { 0 };
361361
unsigned m_endColumn { UINT_MAX };
362362

363-
int m_numVars { 0 };
364-
int m_numCalleeLocals { 0 };
365-
int m_numParameters { 0 };
363+
unsigned m_numVars { 0 };
364+
unsigned m_numCalleeLocals { 0 };
365+
unsigned m_numParameters { 0 };
366366

367367
PackedRefPtr<StringImpl> m_sourceURLDirective;
368368
PackedRefPtr<StringImpl> m_sourceMappingURLDirective;

‎bytecode/UnlinkedCodeBlockGenerator.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ class UnlinkedCodeBlockGenerator {
5757
EvalContextType evalContextType() const { return m_codeBlock->evalContextType(); }
5858
bool isArrowFunctionContext() const { return m_codeBlock->isArrowFunctionContext(); }
5959
bool isClassContext() const { return m_codeBlock->isClassContext(); }
60-
int numCalleeLocals() const { return m_codeBlock->m_numCalleeLocals; }
61-
int numVars() const { return m_codeBlock->m_numVars; }
60+
unsigned numCalleeLocals() const { return m_codeBlock->m_numCalleeLocals; }
61+
unsigned numVars() const { return m_codeBlock->m_numVars; }
6262
unsigned numParameters() const { return m_codeBlock->numParameters(); }
6363
VirtualRegister thisRegister() const { return m_codeBlock->thisRegister(); }
6464
VirtualRegister scopeRegister() const { return m_codeBlock->scopeRegister(); }
@@ -69,11 +69,11 @@ class UnlinkedCodeBlockGenerator {
6969
// Updating UnlinkedCodeBlock.
7070
void setHasCheckpoints() { m_codeBlock->setHasCheckpoints(); }
7171
void setHasTailCalls() { m_codeBlock->setHasTailCalls(); }
72-
void setNumCalleeLocals(int numCalleeLocals) { m_codeBlock->m_numCalleeLocals = numCalleeLocals; }
73-
void setNumVars(int numVars) { m_codeBlock->m_numVars = numVars; }
72+
void setNumCalleeLocals(unsigned numCalleeLocals) { m_codeBlock->m_numCalleeLocals = numCalleeLocals; }
73+
void setNumVars(unsigned numVars) { m_codeBlock->m_numVars = numVars; }
7474
void setThisRegister(VirtualRegister thisRegister) { m_codeBlock->setThisRegister(thisRegister); }
7575
void setScopeRegister(VirtualRegister thisRegister) { m_codeBlock->setScopeRegister(thisRegister); }
76-
void setNumParameters(int newValue) { m_codeBlock->setNumParameters(newValue); }
76+
void setNumParameters(unsigned newValue) { m_codeBlock->setNumParameters(newValue); }
7777

7878
UnlinkedMetadataTable& metadata() { return m_codeBlock->metadata(); }
7979
void addExpressionInfo(unsigned instructionOffset, int divot, int startOffset, int endOffset, unsigned line, unsigned column);

0 commit comments

Comments
 (0)