Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Please merge c01c62c76c60a5a5da0496e41faae907944c92dd (regression, trivial fix) – [MC][ELF] Fix accepting abbreviated form with Type change #52607

Closed
tob2 opened this issue Dec 11, 2021 · 5 comments

Comments

@tob2
Copy link
Contributor

tob2 commented Dec 11, 2021

Trivial change (silence bogus error), which is a regression.

@tstellar – Please merge c01c62c (cf. also D114717 ) into 13.0.1 (→ 13.0.1 Meta Issue #51489).

Change is just the following to silence an error (+ moving a comment + testcase):

-  if (Section->getType() != Type &&
+  if (!TypeName.empty() && Section->getType() != Type &&
       !allowSectionTypeMismatch(getContext().getTargetTriple(), SectionName,
                                 Type))
     Error(loc, "changed section type for " + SectionName + ", expected: 0x" +
                    utohexstr(Section->getType()));
@asl asl added the help wanted Indicates that a maintainer wants help. Not [good first issue]. label Dec 12, 2021
@asl asl added this to the LLVM 13.0.1 release milestone Dec 12, 2021
@asl asl added release:backport and removed help wanted Indicates that a maintainer wants help. Not [good first issue]. labels Dec 12, 2021
@tstellar
Copy link
Collaborator

@MaskRay Is this OK to backport: c01c62c

@MaskRay
Copy link
Member

MaskRay commented Dec 13, 2021

@MaskRay Is this OK to backport: c01c62c

@tstellar Safe. Please backport.

@tstellar
Copy link
Collaborator

tstellar commented Dec 14, 2021

This fails to cherry-pick cleanly. Can someone resolve the conflicts and push to a fork on github?

@MaskRay
Copy link
Member

MaskRay commented Dec 15, 2021

The conflict was due to missing 990e802 ([MC][ELF] Do not error on parsing .debug_* section directive for MIPS), which was worth merging as well. Merged it and [MC][ELF] Fix accepting abbreviated form with Type change into release/13.x.

@MaskRay MaskRay closed this as completed Dec 15, 2021
@tstellar
Copy link
Collaborator

/cherry-pick 990e802 c01c62c

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

4 participants