Skip to content

Commit a77673b

Browse files
author
git apple-llvm automerger
committed
Merge commit '82f9b0fbda81' from llvm.org/main into next
2 parents 51f4986 + 82f9b0f commit a77673b

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

llvm/include/llvm/MC/MCFragment.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class MCFragment {
5858
MCFragment *Next = nullptr;
5959

6060
/// The data for the section this fragment is in.
61-
MCSection *Parent;
61+
MCSection *Parent = nullptr;
6262

6363
/// The offset of this fragment in its section.
6464
uint64_t Offset = 0;

llvm/lib/MC/MCFragment.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,7 @@ uint64_t llvm::computeBundlePadding(const MCAssembler &Assembler,
199199
/* *** */
200200

201201
MCFragment::MCFragment(FragmentType Kind, bool HasInstructions)
202-
: Parent(Parent), Kind(Kind), HasInstructions(HasInstructions),
203-
LinkerRelaxable(false) {}
202+
: Kind(Kind), HasInstructions(HasInstructions), LinkerRelaxable(false) {}
204203

205204
void MCFragment::destroy() {
206205
// First check if we are the sentinel.

0 commit comments

Comments
 (0)