Skip to content

Commit cd83389

Browse files
Landoiainireland
Lando
authored and
iainireland
committed
Bug 1703469: apply code formatting via Lando
# ignore-this-changeset
1 parent 7cc7775 commit cd83389

12 files changed

+48
-53
lines changed

‎js/src/jit/BaselineCacheIRCompiler.cpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1750,17 +1750,16 @@ bool BaselineCacheIRCompiler::emitCallScriptedSetter(
17501750
bool sameRealm, uint32_t nargsAndFlagsOffset) {
17511751
JitSpew(JitSpew_Codegen, "%s", __FUNCTION__);
17521752
Maybe<uint32_t> icScriptOffset = mozilla::Nothing();
1753-
return emitCallScriptedSetterShared(receiverId, calleeId, rhsId,
1754-
sameRealm, nargsAndFlagsOffset,
1755-
icScriptOffset);
1753+
return emitCallScriptedSetterShared(receiverId, calleeId, rhsId, sameRealm,
1754+
nargsAndFlagsOffset, icScriptOffset);
17561755
}
17571756

17581757
bool BaselineCacheIRCompiler::emitCallInlinedSetter(
17591758
ObjOperandId receiverId, ObjOperandId calleeId, ValOperandId rhsId,
17601759
uint32_t icScriptOffset, bool sameRealm, uint32_t nargsAndFlagsOffset) {
17611760
JitSpew(JitSpew_Codegen, "%s", __FUNCTION__);
1762-
return emitCallScriptedSetterShared(receiverId, calleeId, rhsId,
1763-
sameRealm, nargsAndFlagsOffset,
1761+
return emitCallScriptedSetterShared(receiverId, calleeId, rhsId, sameRealm,
1762+
nargsAndFlagsOffset,
17641763
mozilla::Some(icScriptOffset));
17651764
}
17661765

‎js/src/jit/CacheIR.cpp‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -997,13 +997,14 @@ void IRGenerator::emitGuardGetterSetterSlot(NativeObject* holder,
997997
// the first IC stub.
998998
if (!isFirstStub_) {
999999
bool isGetter = kind == AccessorKind::Getter;
1000-
JSObject* accessor = isGetter ? holder->getGetter(prop)
1001-
: holder->getSetter(prop);
1000+
JSObject* accessor =
1001+
isGetter ? holder->getGetter(prop) : holder->getSetter(prop);
10021002
JSFunction* fun = &accessor->as<JSFunction>();
10031003
if (fun->hasBaseScript()) {
1004-
ValOperandId getterSetterId = EmitLoadSlot(writer, holder, holderId, slot);
1005-
ObjOperandId functionId = writer.loadGetterSetterFunction(getterSetterId,
1006-
isGetter);
1004+
ValOperandId getterSetterId =
1005+
EmitLoadSlot(writer, holder, holderId, slot);
1006+
ObjOperandId functionId =
1007+
writer.loadGetterSetterFunction(getterSetterId, isGetter);
10071008
writer.saveScriptedGetterSetterCallee(functionId);
10081009
writer.guardFunctionScript(functionId, fun->baseScript());
10091010
return;
@@ -1043,8 +1044,7 @@ void GetPropIRGenerator::emitCallGetterResultGuards(NativeObject* obj,
10431044
ObjOperandId holderId = writer.loadObject(holder);
10441045
TestMatchingHolder(writer, holder, holderId);
10451046

1046-
emitGuardGetterSetterSlot(holder, prop, holderId,
1047-
AccessorKind::Getter,
1047+
emitGuardGetterSetterSlot(holder, prop, holderId, AccessorKind::Getter,
10481048
/* holderIsConstant = */ true);
10491049
} else {
10501050
emitGuardGetterSetterSlot(holder, prop, objId, AccessorKind::Getter);
@@ -1993,8 +1993,7 @@ AttachDecision GetPropIRGenerator::tryAttachDOMProxyUnshadowed(
19931993
MOZ_ASSERT(kind == NativeGetPropKind::NativeGetter ||
19941994
kind == NativeGetPropKind::ScriptedGetter);
19951995
MOZ_ASSERT(!isSuper());
1996-
emitGuardGetterSetterSlot(holder, *prop, holderId,
1997-
AccessorKind::Getter,
1996+
emitGuardGetterSetterSlot(holder, *prop, holderId, AccessorKind::Getter,
19981997
/* holderIsConstant = */ true);
19991998
emitCallGetterResultNoGuards(kind, nativeProtoObj, holder, *prop,
20001999
receiverId);
@@ -3647,14 +3646,12 @@ AttachDecision GetNameIRGenerator::tryAttachGlobalNameGetter(ObjOperandId objId,
36473646
// Shape guard holder.
36483647
ObjOperandId holderId = writer.loadObject(holder);
36493648
writer.guardShape(holderId, holder->shape());
3650-
emitGuardGetterSetterSlot(holder, *prop, holderId,
3651-
AccessorKind::Getter,
3649+
emitGuardGetterSetterSlot(holder, *prop, holderId, AccessorKind::Getter,
36523650
/* holderIsConstant = */ true);
36533651
} else {
36543652
// Note: pass true for |holderIsConstant| because the holder must be the
36553653
// current global object.
3656-
emitGuardGetterSetterSlot(holder, *prop, globalId,
3657-
AccessorKind::Getter,
3654+
emitGuardGetterSetterSlot(holder, *prop, globalId, AccessorKind::Getter,
36583655
/* holderIsConstant = */ true);
36593656
}
36603657

@@ -4900,8 +4897,7 @@ AttachDecision SetPropIRGenerator::tryAttachSetter(HandleObject obj,
49004897
ObjOperandId holderId = writer.loadObject(holder);
49014898
TestMatchingHolder(writer, holder, holderId);
49024899

4903-
emitGuardGetterSetterSlot(holder, *prop, holderId,
4904-
AccessorKind::Setter,
4900+
emitGuardGetterSetterSlot(holder, *prop, holderId, AccessorKind::Setter,
49054901
/* holderIsConstant = */ true);
49064902
} else {
49074903
emitGuardGetterSetterSlot(holder, *prop, objId, AccessorKind::Setter);

‎js/src/jit/CacheIRCompiler.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9328,7 +9328,8 @@ bool CacheIRCompiler::emitLoadGetterSetterFunction(ValOperandId getterSetterId,
93289328

93299329
masm.unboxNonDouble(getterSetter, output, JSVAL_TYPE_PRIVATE_GCTHING);
93309330

9331-
size_t offset = isGetter ? GetterSetter::offsetOfGetter() : GetterSetter::offsetOfSetter();
9331+
size_t offset = isGetter ? GetterSetter::offsetOfGetter()
9332+
: GetterSetter::offsetOfSetter();
93329333
masm.loadPtr(Address(output, offset), output);
93339334

93349335
masm.branchTestPtr(Assembler::Zero, output, output, failure->label());
@@ -9337,7 +9338,6 @@ bool CacheIRCompiler::emitLoadGetterSetterFunction(ValOperandId getterSetterId,
93379338
return true;
93389339
}
93399340

9340-
93419341
bool CacheIRCompiler::emitGuardHasGetterSetter(ObjOperandId objId,
93429342
uint32_t idOffset,
93439343
uint32_t getterSetterOffset) {

‎js/src/jit/CacheIRGenerator.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@ class MOZ_RAII IRGenerator {
109109

110110
enum class AccessorKind { Getter, Setter };
111111
void emitGuardGetterSetterSlot(NativeObject* holder, PropertyInfo prop,
112-
ObjOperandId holderId,
113-
AccessorKind kind,
112+
ObjOperandId holderId, AccessorKind kind,
114113
bool holderIsConstant = false);
115114
void emitCallGetterResultNoGuards(NativeGetPropKind kind, NativeObject* obj,
116115
NativeObject* holder, PropertyInfo prop,

‎js/src/jit/CacheIRWriter.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,8 +636,8 @@ class MOZ_RAII CacheIRWriter : public JS::CustomAutoRooter {
636636
}
637637
return loadObject(target);
638638
}
639-
public:
640639

640+
public:
641641
void callScriptedGetterResult(ValOperandId receiver, JSFunction* getter,
642642
bool sameRealm) {
643643
MOZ_ASSERT(getter->hasJitEntry());

‎js/src/jit/CodeGenerator.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21109,7 +21109,8 @@ void CodeGenerator::visitLoadWrapperTarget(LLoadWrapperTarget* lir) {
2110921109
}
2111021110
}
2111121111

21112-
void CodeGenerator::visitLoadGetterSetterFunction(LLoadGetterSetterFunction* lir) {
21112+
void CodeGenerator::visitLoadGetterSetterFunction(
21113+
LLoadGetterSetterFunction* lir) {
2111321114
ValueOperand getterSetter = ToValue(lir->getterSetter());
2111421115
Register output = ToRegister(lir->output());
2111521116
Register temp = ToRegister(lir->temp0());

‎js/src/jit/CompileInfo.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,8 @@ inline unsigned CountArgSlots(JSScript* script, bool hasFun,
6666
// Contains information about the compilation source for IR being generated.
6767
class CompileInfo {
6868
public:
69-
CompileInfo(CompileRuntime* runtime, JSScript* script,
70-
jsbytecode* osrPc, bool scriptNeedsArgsObj,
71-
InlineScriptTree* inlineScriptTree)
69+
CompileInfo(CompileRuntime* runtime, JSScript* script, jsbytecode* osrPc,
70+
bool scriptNeedsArgsObj, InlineScriptTree* inlineScriptTree)
7271
: script_(script),
7372
fun_(script->function()),
7473
osrPc_(osrPc),

‎js/src/jit/Ion.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1778,9 +1778,9 @@ static AbortReason IonCompile(JSContext* cx, HandleScript script,
17781778
return AbortReason::Alloc;
17791779
}
17801780

1781-
CompileInfo* info = alloc->new_<CompileInfo>(
1782-
CompileRuntime::get(cx->runtime()), script, osrPc,
1783-
script->needsArgsObj(), inlineScriptTree);
1781+
CompileInfo* info =
1782+
alloc->new_<CompileInfo>(CompileRuntime::get(cx->runtime()), script,
1783+
osrPc, script->needsArgsObj(), inlineScriptTree);
17841784
if (!info) {
17851785
return AbortReason::Alloc;
17861786
}

‎js/src/jit/IonCacheIRCompiler.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -924,8 +924,8 @@ bool IonCacheIRCompiler::emitLoadDynamicSlotResult(ObjOperandId objId,
924924
}
925925

926926
bool IonCacheIRCompiler::emitCallScriptedGetterResult(
927-
ValOperandId receiverId, ObjOperandId calleeId,
928-
bool sameRealm, uint32_t nargsAndFlagsOffset) {
927+
ValOperandId receiverId, ObjOperandId calleeId, bool sameRealm,
928+
uint32_t nargsAndFlagsOffset) {
929929
JitSpew(JitSpew_Codegen, "%s", __FUNCTION__);
930930
AutoSaveLiveRegisters save(*this);
931931
AutoOutputRegister output(*this);

‎js/src/jit/Lowering.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7466,7 +7466,8 @@ void LIRGenerator::visitLoadWrapperTarget(MLoadWrapperTarget* ins) {
74667466
define(lir, ins);
74677467
}
74687468

7469-
void LIRGenerator::visitLoadGetterSetterFunction(MLoadGetterSetterFunction* ins) {
7469+
void LIRGenerator::visitLoadGetterSetterFunction(
7470+
MLoadGetterSetterFunction* ins) {
74707471
MDefinition* getterSetter = ins->getterSetter();
74717472

74727473
auto* lir = new (alloc())

0 commit comments

Comments
 (0)