@@ -310,36 +310,33 @@ template <> struct MDNodeKeyImpl<MDTuple> : MDNodeOpsKey {
310310
311311/// DenseMapInfo for DILocation.
312312template <> struct MDNodeKeyImpl<DILocation> {
313- unsigned Line;
314- uint16_t Column;
315313 Metadata *Scope;
316314 Metadata *InlinedAt;
317- bool ImplicitCode;
318315#ifdef EXPERIMENTAL_KEY_INSTRUCTIONS
319316 uint64_t AtomGroup : 61;
320317 uint64_t AtomRank : 3;
321318#endif
319+ unsigned Line;
320+ uint16_t Column;
321+ bool ImplicitCode;
322322
323323 MDNodeKeyImpl(unsigned Line, uint16_t Column, Metadata *Scope,
324324 Metadata *InlinedAt, bool ImplicitCode, uint64_t AtomGroup,
325325 uint8_t AtomRank)
326- : Line(Line), Column(Column), Scope(Scope), InlinedAt(InlinedAt),
327- ImplicitCode(ImplicitCode)
326+ : Scope(Scope), InlinedAt(InlinedAt),
328327#ifdef EXPERIMENTAL_KEY_INSTRUCTIONS
329- ,
330- AtomGroup(AtomGroup), AtomRank(AtomRank)
328+ AtomGroup(AtomGroup), AtomRank(AtomRank),
331329#endif
332- {
330+ Line(Line), Column(Column), ImplicitCode(ImplicitCode) {
333331 }
334332
335333 MDNodeKeyImpl(const DILocation *L)
336- : Line(L->getLine()), Column(L->getColumn()), Scope(L->getRawScope()),
337- InlinedAt(L->getRawInlinedAt()), ImplicitCode(L->isImplicitCode())
334+ : Scope(L->getRawScope()), InlinedAt(L->getRawInlinedAt()),
338335#ifdef EXPERIMENTAL_KEY_INSTRUCTIONS
339- ,
340- AtomGroup(L->getAtomGroup()), AtomRank(L->getAtomRank())
336+ AtomGroup(L->getAtomGroup()), AtomRank(L->getAtomRank()),
341337#endif
342- {
338+ Line(L->getLine()), Column(L->getColumn()),
339+ ImplicitCode(L->isImplicitCode()) {
343340 }
344341
345342 bool isKeyOf(const DILocation *RHS) const {
0 commit comments