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 coverage when /fo is used #88201

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

Conversation

pdagobert
Copy link

Fixes #87304

Copy link

github-actions bot commented Apr 9, 2024

Thank you for submitting a Pull Request (PR) to the LLVM Project!

This PR will be automatically labeled and the relevant teams will be
notified.

If you wish to, you can add reviewers by using the "Reviewers" section on this page.

If this is not working for you, it is probably because you do not have write
permissions for the repository. In which case you can instead tag reviewers by
name in a comment by using @ followed by their GitHub username.

If you have received no comments on your PR for a week, you can request a review
by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate
is once a week. Please remember that you are asking for valuable time from other developers.

If you have further questions, they may be answered by the LLVM GitHub User Guide.

You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums.

@llvmbot llvmbot added clang Clang issues not falling into any other category clang:driver 'clang' and 'clang++' user-facing binaries. Not 'clang-cl' labels Apr 9, 2024
@llvmbot
Copy link
Collaborator

llvmbot commented Apr 9, 2024

@llvm/pr-subscribers-clang-driver

@llvm/pr-subscribers-clang

Author: None (pdagobert)

Changes

Fixes #87304


Full diff: https://github.com/llvm/llvm-project/pull/88201.diff

1 Files Affected:

  • (modified) clang/lib/Driver/ToolChains/Clang.cpp (+4)
diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp
index 766a9b91e3c0ad..44d18acd25a589 100644
--- a/clang/lib/Driver/ToolChains/Clang.cpp
+++ b/clang/lib/Driver/ToolChains/Clang.cpp
@@ -802,6 +802,10 @@ static void addPGOAndCoverageFlags(const ToolChain &TC, Compilation &C,
     } else if (Arg *FinalOutput =
                    C.getArgs().getLastArg(options::OPT__SLASH_Fo)) {
       CoverageFilename = FinalOutput->getValue();
+      StringRef V = FinalOutput->getValue();
+      if (llvm::sys::path::is_separator(V.back())) {
+        CoverageFilename += llvm::sys::path::filename(Output.getBaseInput());
+      }
     } else if (Arg *FinalOutput = C.getArgs().getLastArg(options::OPT_o)) {
       CoverageFilename = FinalOutput->getValue();
     } else {

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
clang:driver 'clang' and 'clang++' user-facing binaries. Not 'clang-cl' clang Clang issues not falling into any other category
Projects
None yet
Development

Successfully merging this pull request may close these issues.

clang-cl doesn't work with --coverage if /fo is given a directory
2 participants