Commit 62808631 authored by Kadir Cetinkaya's avatar Kadir Cetinkaya
Browse files

Revert "Use -fdebug-compilation-dir to form absolute paths in coverage mappings" 

This reverts commit f6777964.

Because the absolute path check relies on temporary path containing
"clang", "test" and "CoverageMapping" as a subsequence, which is not
necessarily true on all systems(breaks internal integrates). Wanted to
fix it by checking for a leading "/" instead, but then noticed that it
would break windows tests, so leaving it to the author instead.

llvm-svn: 374324
parent 44506cd7

clang/lib/CodeGen/CoverageMappingGen.cpp

+7 −18
Original line number Diff line number Diff line
@@ -1278,6 +1278,13 @@ std::string getCoverageSection(const CodeGenModule &CGM) { 
      CGM.getContext().getTargetInfo().getTriple().getObjectFormat());

}



std::string normalizeFilename(StringRef Filename) {

  llvm::SmallString<256> Path(Filename);

  llvm::sys::fs::make_absolute(Path);

  llvm::sys::path::remove_dots(Path, /*remove_dot_dot=*/true);

  return Path.str().str();

}



} // end anonymous namespace



static void dump(llvm::raw_ostream &OS, StringRef FunctionName,
@@ -1310,24 +1317,6 @@ static void dump(llvm::raw_ostream &OS, StringRef FunctionName, 
  }

}



CoverageMappingModuleGen::CoverageMappingModuleGen(

    CodeGenModule &CGM, CoverageSourceInfo &SourceInfo)

    : CGM(CGM), SourceInfo(SourceInfo), FunctionRecordTy(nullptr) {

  // Honor -fdebug-compilation-dir in paths in coverage data. Otherwise, use the

  // regular working directory when normalizing paths.

  if (!CGM.getCodeGenOpts().DebugCompilationDir.empty())

    CWD = CGM.getCodeGenOpts().DebugCompilationDir;

  else

    llvm::sys::fs::current_path(CWD);

}



std::string CoverageMappingModuleGen::normalizeFilename(StringRef Filename) {

  llvm::SmallString<256> Path(Filename);

  llvm::sys::fs::make_absolute(CWD, Path);

  llvm::sys::path::remove_dots(Path, /*remove_dot_dot=*/true);

  return Path.str().str();

}



void CoverageMappingModuleGen::addFunctionMappingRecord(

    llvm::GlobalVariable *NamePtr, StringRef NameValue, uint64_t FuncHash,

    const std::string &CoverageMapping, bool IsUsed) {

clang/lib/CodeGen/CoverageMappingGen.h

+2 −6
Original line number Diff line number Diff line
@@ -54,14 +54,10 @@ class CoverageMappingModuleGen { 
  std::vector<llvm::Constant *> FunctionNames;

  llvm::StructType *FunctionRecordTy;

  std::vector<std::string> CoverageMappings;

  SmallString<256> CWD;



  /// Make the filename absolute, remove dots, and normalize slashes to local

  /// path style.

  std::string normalizeFilename(StringRef Filename);



public:

  CoverageMappingModuleGen(CodeGenModule &CGM, CoverageSourceInfo &SourceInfo);

  CoverageMappingModuleGen(CodeGenModule &CGM, CoverageSourceInfo &SourceInfo)

      : CGM(CGM), SourceInfo(SourceInfo), FunctionRecordTy(nullptr) {}



  CoverageSourceInfo &getSourceInfo() const {

    return SourceInfo;

clang/test/CoverageMapping/debug-dir.cpp

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
// %s expands to an absolute path, so to test relative paths we need to create a

// clean directory, put the source there, and cd into it.

// RUN: rm -rf %t

// RUN: mkdir -p %t/foobar

// RUN: cd %t

// RUN: cp %s foobar/debug-dir.cpp



// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -emit-llvm -main-file-name debug-dir.cpp foobar/debug-dir.cpp  -o - | FileCheck -check-prefix=ABSOLUTE %s

//

// ABSOLUTE: @__llvm_coverage_mapping = {{.*"\\01.*clang.*test.*CoverageMapping.*.*foobar.*debug-dir\.cpp}}



// RUN: %clang_cc1 -fprofile-instrument=clang -fcoverage-mapping -emit-llvm -main-file-name debug-dir.cpp foobar/debug-dir.cpp -fdebug-compilation-dir . -o - | FileCheck -check-prefix=RELATIVE %s

//

// RELATIVE: @__llvm_coverage_mapping = {{.*"\\01[^/]*foobar.*debug-dir\.cpp}}



void f1() {}