Skip to content

Commit c97828f

Browse files
committed
[𝘀𝗽𝗿] changes introduced through rebase
Created using spr 1.3.6-beta.1 [skip ci]
1 parent ce75a18 commit c97828f

File tree

8 files changed

+14
-14
lines changed

8 files changed

+14
-14
lines changed

llvm/include/llvm/CodeGen/MachineInstr.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,9 +280,7 @@ class MachineInstr
280280
size_t numTrailingObjects(OverloadToken<uint32_t>) const {
281281
return HasCFIType;
282282
}
283-
size_t numTrailingObjects(OverloadToken<Value *>) const {
284-
return HasDS;
285-
}
283+
size_t numTrailingObjects(OverloadToken<Value *>) const { return HasDS; }
286284

287285
// Just a boring constructor to allow us to initialize the sizes. Always use
288286
// the `create` routine above.

llvm/include/llvm/CodeGen/SelectionDAGNodes.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2011,8 +2011,7 @@ class DeactivationSymbolSDNode : public SDNode {
20112011
const GlobalValue *TheGlobal;
20122012

20132013
DeactivationSymbolSDNode(const GlobalValue *GV, SDVTList VTs)
2014-
: SDNode(ISD::DEACTIVATION_SYMBOL, 0, DebugLoc(), VTs),
2015-
TheGlobal(GV) {}
2014+
: SDNode(ISD::DEACTIVATION_SYMBOL, 0, DebugLoc(), VTs), TheGlobal(GV) {}
20162015

20172016
public:
20182017
const GlobalValue *getGlobal() const { return TheGlobal; }

llvm/lib/Analysis/PtrUseVisitor.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ void detail::PtrUseVisitorBase::enqueueUsers(Value &I) {
2121
for (Use &U : I.uses()) {
2222
if (VisitedUses.insert(&U).second) {
2323
UseToVisit NewU = {
24-
UseToVisit::UseAndIsOffsetKnownPair(&U, IsOffsetKnown),
25-
Offset,
26-
ProtectedFieldDisc,
24+
UseToVisit::UseAndIsOffsetKnownPair(&U, IsOffsetKnown),
25+
Offset,
26+
ProtectedFieldDisc,
2727
};
2828
Worklist.push_back(std::move(NewU));
2929
}

llvm/lib/AsmParser/LLParser.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4250,7 +4250,8 @@ bool LLParser::parseValID(ValID &ID, PerFunctionState *PFS, Type *ExpectedTy) {
42504250
}
42514251
case lltok::kw_ptrauth: {
42524252
// ValID ::= 'ptrauth' '(' ptr @foo ',' i32 <key>
4253-
// (',' i64 <disc> (',' ptr addrdisc (',' ptr ds)? )? )? ')'
4253+
// (',' i64 <disc> (',' ptr addrdisc (',' ptr ds)?
4254+
// )? )? ')'
42544255
Lex.Lex();
42554256

42564257
Constant *Ptr, *Key;

llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3549,7 +3549,7 @@ void SelectionDAGISel::SelectCodeCommon(SDNode *NodeToMatch,
35493549
if (N->getNumOperands() != 0 &&
35503550
N->getOperand(N->getNumOperands() - 1).getOpcode() ==
35513551
ISD::DEACTIVATION_SYMBOL)
3552-
DeactivationSymbol = N->getOperand(N->getNumOperands()-1);
3552+
DeactivationSymbol = N->getOperand(N->getNumOperands() - 1);
35533553
continue;
35543554

35553555
case OPC_MoveChild: {

llvm/lib/IR/Constants.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2155,8 +2155,8 @@ bool ConstantPtrAuth::hasSpecialAddressDiscriminator(uint64_t Value) const {
21552155
bool ConstantPtrAuth::isKnownCompatibleWith(const Value *Key,
21562156
const Value *Discriminator,
21572157
const DataLayout &DL) const {
2158-
// This function may only be validly called to analyze a ptrauth operation with
2159-
// no deactivation symbol, so if we have one it isn't compatible.
2158+
// This function may only be validly called to analyze a ptrauth operation
2159+
// with no deactivation symbol, so if we have one it isn't compatible.
21602160
if (!getDeactivationSymbol()->isNullValue())
21612161
return false;
21622162

llvm/lib/Target/AArch64/AArch64AsmPrinter.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2358,7 +2358,8 @@ static void emitAddress(MCStreamer &Streamer, MCRegister Reg,
23582358
.addImm(0),
23592359
STI);
23602360
} else {
2361-
auto *SymRef = MCSymbolRefExpr::create(Val.getAddSym(), Streamer.getContext());
2361+
auto *SymRef =
2362+
MCSymbolRefExpr::create(Val.getAddSym(), Streamer.getContext());
23622363
Streamer.emitInstruction(
23632364
MCInstBuilder(AArch64::ADRP)
23642365
.addReg(Reg)

llvm/lib/Transforms/Scalar/SROA.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,8 @@ class Slice {
539539
Slice(uint64_t BeginOffset, uint64_t EndOffset, Use *U, bool IsSplittable,
540540
Value *ProtectedFieldDisc)
541541
: BeginOffset(BeginOffset), EndOffset(EndOffset),
542-
UseAndIsSplittable(U, IsSplittable), ProtectedFieldDisc(ProtectedFieldDisc) {}
542+
UseAndIsSplittable(U, IsSplittable),
543+
ProtectedFieldDisc(ProtectedFieldDisc) {}
543544

544545
uint64_t beginOffset() const { return BeginOffset; }
545546
uint64_t endOffset() const { return EndOffset; }

0 commit comments

Comments
 (0)