From b56b1e67e38e5f18318b411587a952bc7c586ac4 Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Mon, 11 May 2020 23:20:33 -0700 Subject: [gcov] Default coverage version to '408*' and delete CC1 option -coverage-exit-block-before-body gcov 4.8 (r189778) moved the exit block from the last to the second. The .gcda format is compatible with 4.7 but * decoding libgcov 4.7 produced .gcda with gcov [4.7,8) can mistake the exit block, emit bogus `%s:'%s' has arcs from exit block\n` warnings, and print wrong `" returned %s` for branch statistics (-b). * decoding libgcov 4.8 produced .gcda with gcov 4.7 has similar issues. Also, rename "return block" to "exit block" because the latter is the appropriate term. --- clang/lib/Frontend/CompilerInvocation.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'clang/lib/Frontend/CompilerInvocation.cpp') diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index 649e78e..ff2683c 100644 --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -1021,8 +1021,6 @@ static bool ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args, InputKind IK, std::string(Args.getLastArgValue(OPT_fprofile_filter_files_EQ)); Opts.ProfileExcludeFiles = std::string(Args.getLastArgValue(OPT_fprofile_exclude_files_EQ)); - Opts.CoverageExitBlockBeforeBody = - Args.hasArg(OPT_coverage_exit_block_before_body); if (Args.hasArg(OPT_coverage_version_EQ)) { StringRef CoverageVersion = Args.getLastArgValue(OPT_coverage_version_EQ); if (CoverageVersion.size() != 4) { -- cgit v1.1