This is an archive of the discontinued LLVM Phabricator instance.

Differential D55037

[-gmodules] Honor -fdebug-prefix-map in the debug info inside PCMs.
ClosedPublic

Authored by aprantl on Nov 28 2018, 5:03 PM.

Details

Reviewers
bruno
rsmith
Commits
rG55fcb4e90eab: [-gmodules] Honor -fdebug-prefix-map in the debug info inside PCMs.
rL347926: [-gmodules] Honor -fdebug-prefix-map in the debug info inside PCMs.
rC347926: [-gmodules] Honor -fdebug-prefix-map in the debug info inside PCMs.
Summary

This patch passes -fdebug-prefix-map (a feature for renaming source paths in the debug info) through to the per-module codegen options and adds the debug prefix map to the module hash.




rdar://problem/46045865
Diff Detail
Repository 
rC Clang 
Event Timeline
aprantl created this revision.Nov 28 2018, 5:03 PM
bruno accepted this revision.Nov 29 2018, 1:39 PM
LGTM
This revision is now accepted and ready to land.Nov 29 2018, 1:39 PM
Closed by commit rC347926: [-gmodules] Honor -fdebug-prefix-map in the debug info inside PCMs. (authored by adrian).  ·  Explain WhyNov 29 2018, 2:36 PM
This revision was automatically updated to reflect the committed changes.
Revision Contents
PathSize
lib/
CodeGen/
2 lines
Frontend/
6 lines
test/
Modules/
23 lines
Diff 175969
lib/CodeGen/ObjectFilePCHContainerOperations.cpp
Show First 20 Lines • Show All 150 Lines • ▼ Show 20 Lines  PCHContainerGenerator(CompilerInstance &CI, const std::string &MainFileName,

    CodeGenOpts.CodeModel = "default";
    CodeGenOpts.CodeModel = "default";

    CodeGenOpts.ThreadModel = "single";
    CodeGenOpts.ThreadModel = "single";

    CodeGenOpts.DebugTypeExtRefs = true;
    CodeGenOpts.DebugTypeExtRefs = true;

    // When building a module MainFileName is the name of the modulemap file.
    // When building a module MainFileName is the name of the modulemap file.

    CodeGenOpts.MainFileName =
    CodeGenOpts.MainFileName =

        LangOpts.CurrentModule.empty() ? MainFileName : LangOpts.CurrentModule;
        LangOpts.CurrentModule.empty() ? MainFileName : LangOpts.CurrentModule;

    CodeGenOpts.setDebugInfo(codegenoptions::FullDebugInfo);
    CodeGenOpts.setDebugInfo(codegenoptions::FullDebugInfo);

    CodeGenOpts.setDebuggerTuning(CI.getCodeGenOpts().getDebuggerTuning());
    CodeGenOpts.setDebuggerTuning(CI.getCodeGenOpts().getDebuggerTuning());

    CodeGenOpts.DebugPrefixMap =

        CI.getInvocation().getCodeGenOpts().DebugPrefixMap;

  }
  }




  ~PCHContainerGenerator() override = default;
  ~PCHContainerGenerator() override = default;




  void Initialize(ASTContext &Context) override {
  void Initialize(ASTContext &Context) override {

    assert(!Ctx && "initialized multiple times");
    assert(!Ctx && "initialized multiple times");




    Ctx = &Context;
    Ctx = &Context;

▲ Show 20 Lines • Show All 188 Lines • Show Last 20 Lines
lib/Frontend/CompilerInvocation.cpp
Show First 20 Lines • Show All 3,258 Lines • ▼ Show 20 Lines#include "clang/Basic/LangOptions.def"

  code = hash_combine(code, hsOpts.ModuleUserBuildPath);
  code = hash_combine(code, hsOpts.ModuleUserBuildPath);




  // Extend the signature with the module file extensions.
  // Extend the signature with the module file extensions.

  const FrontendOptions &frontendOpts = getFrontendOpts();
  const FrontendOptions &frontendOpts = getFrontendOpts();

  for (const auto &ext : frontendOpts.ModuleFileExtensions) {
  for (const auto &ext : frontendOpts.ModuleFileExtensions) {

    code = ext->hashExtension(code);
    code = ext->hashExtension(code);

  }
  }




  // When compiling with -gmodules, also hash -fdebug-prefix-map as it

  // affects the debug info in the PCM.

  if (getCodeGenOpts().DebugTypeExtRefs)

    for (const auto &KeyValue : getCodeGenOpts().DebugPrefixMap)

      code = hash_combine(code, KeyValue.first, KeyValue.second);



  // Extend the signature with the enabled sanitizers, if at least one is
  // Extend the signature with the enabled sanitizers, if at least one is

  // enabled. Sanitizers which cannot affect AST generation aren't hashed.
  // enabled. Sanitizers which cannot affect AST generation aren't hashed.

  SanitizerSet SanHash = LangOpts->Sanitize;
  SanitizerSet SanHash = LangOpts->Sanitize;

  SanHash.clear(getPPTransparentSanitizers());
  SanHash.clear(getPPTransparentSanitizers());

  if (!SanHash.empty())
  if (!SanHash.empty())

    code = hash_combine(code, SanHash.Mask);
    code = hash_combine(code, SanHash.Mask);




  return llvm::APInt(64, code).toString(36, /*Signed=*/false);
  return llvm::APInt(64, code).toString(36, /*Signed=*/false);

▲ Show 20 Lines • Show All 68 Lines • Show Last 20 Lines
test/Modules/module-debuginfo-prefix.m
// REQUIRES: asserts



// Modules:

// RUN: rm -rf %t

// RUN: %clang_cc1 -x objective-c -fmodules -fmodule-format=obj \

// RUN:   -fdebug-prefix-map=%S/Inputs=/OVERRIDE \

// RUN:   -fimplicit-module-maps -DMODULES -fmodules-cache-path=%t %s \

// RUN:   -I %S/Inputs -I %t -emit-llvm -o %t.ll \

// RUN:   -mllvm -debug-only=pchcontainer &>%t-mod.ll

// RUN: cat %t-mod.ll | FileCheck %s



// PCH:

// RUN: %clang_cc1 -x objective-c -emit-pch -fmodule-format=obj -I %S/Inputs \

// RUN:   -fdebug-prefix-map=%S/Inputs=/OVERRIDE \

// RUN:   -o %t.pch %S/Inputs/DebugObjC.h \

// RUN:   -mllvm -debug-only=pchcontainer &>%t-pch.ll

// RUN: cat %t-pch.ll | FileCheck %s



#ifdef MODULES

@import DebugObjC;

#endif



// CHECK: !DIFile({{.*}}"/OVERRIDE/DebugObjC.h"