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

Fix 3 bad source code merges. #1210

Open
wants to merge 1 commit into
base: 17-init-main
Choose a base branch
from

Conversation

dtarditi
Copy link
Member

@dtarditi dtarditi commented Oct 3, 2024

Fix some incorrect merges that were causing test failures:

  • In 2 cases, statements were accidentally deleted. Restore them.
  • In SemaDecl.cpp, we kept some old code that should have been deleted. This caused processing of section pragmas and section information on declarations to be skipped on non-C++ files.

These were identified by looking at diffs with the original clang source code or debugging the handling failing test cases in the compiler.

This fixes 20 failing tests. With this change, the test results from check-clang are:

Testing Time: 6139.36s
  Skipped          :    30
  Unsupported      :   237
  Passed           : 33385
  Expectedly Failed:    39
  Failed           :    48

Fix some incorrect merges that were causing test failures:
- In 2 cases, statements were accidentally deleted.  Restore them.
- In SemaDecl.cpp, we kept some old code that should have been deleted.
  This caused processing of section pragmas and section information on
  declarations to be skipped on non-C++ files.

These were identified by looking at diffs with the original clang
source code or debugging the handling failing test cases in the compiler.

This fixes about 20 failing tests.
Copy link
Member

@souragc souragc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

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

Successfully merging this pull request may close these issues.

2 participants