Commit fd5aa135 authored by David Blaikie's avatar David Blaikie
Browse files

DebugInfo: Support imported modules (using directives) within lexical blocks. 

llvm-svn: 181272
parent 684fc533

clang/lib/CodeGen/CGDebugInfo.cpp

+5 −2
Original line number Diff line number Diff line
@@ -2930,9 +2930,12 @@ void CGDebugInfo::EmitGlobalVariable(const ValueDecl *VD, 
}



void CGDebugInfo::EmitUsingDirective(const UsingDirectiveDecl &UD) {

  llvm::DIScope Scope =

      LexicalBlockStack.empty()

          ? getContextDescriptor(cast<Decl>(UD.getDeclContext()))

          : llvm::DIScope(LexicalBlockStack.back());

  DBuilder.createImportedModule(

      getContextDescriptor(cast<Decl>(UD.getDeclContext())),

      getOrCreateNameSpace(UD.getNominatedNamespace()),

      Scope, getOrCreateNameSpace(UD.getNominatedNamespace()),

      getLineNumber(UD.getLocation()));

}

clang/test/CodeGenCXX/debug-info-namespace.cpp

+11 −5
Original line number Diff line number Diff line
@@ -10,10 +10,14 @@ using namespace B; 


using namespace A;



int func() {

int func(bool b) {

  if (b) {

    using namespace A::B;

    return i;

  }

  using namespace A;

  return B::i;

}



// CHECK: [[CU:![0-9]*]] = {{.*}}[[MODULES:![0-9]*]], metadata !""} ; [ DW_TAG_compile_unit ]

// CHECK: [[FILE:![0-9]*]] {{.*}}debug-info-namespace.cpp"
@@ -22,10 +26,12 @@ int func() { 
// CHECK: [[VAR:![0-9]*]] = {{.*}}, metadata [[NS:![0-9]*]], metadata !"i", {{.*}} ; [ DW_TAG_variable ] [i]

// CHECK: [[NS]] = {{.*}}, metadata [[FILE2]], metadata [[CTXT:![0-9]*]], {{.*}} ; [ DW_TAG_namespace ] [B] [line 1]

// CHECK: [[CTXT]] = {{.*}}, metadata [[FILE]], null, {{.*}} ; [ DW_TAG_namespace ] [A] [line 3]

// CHECK: [[MODULES]] = metadata !{metadata [[M1:![0-9]*]], metadata [[M2:![0-9]*]], metadata [[M3:![0-9]*]]}

// CHECK: [[MODULES]] = metadata !{metadata [[M1:![0-9]*]], metadata [[M2:![0-9]*]], metadata [[M3:![0-9]*]], metadata [[M4:![0-9]*]]}

// CHECK: [[M1]] = metadata !{i32 {{[0-9]*}}, metadata [[CTXT]], metadata [[NS]], i32 4} ; [ DW_TAG_imported_module ]

// CHECK: [[M2]] = metadata !{i32 {{[0-9]*}}, metadata [[CU]], metadata [[CTXT]], i32 7} ; [ DW_TAG_imported_module ]

// CHECK: [[M3]] = metadata !{i32 {{[0-9]*}}, metadata [[FUNC]], metadata [[NS]], i32 10} ; [ DW_TAG_imported_module ]

// CHECK: [[M3]] = metadata !{i32 {{[0-9]*}}, metadata [[LEX:![0-9]*]], metadata [[NS]], i32 11} ; [ DW_TAG_imported_module ]

// CHECK: [[LEX]] = metadata !{i32 {{[0-9]*}}, metadata [[FILE2]], metadata [[FUNC]], i32 10, i32 0, i32 0} ; [ DW_TAG_lexical_block ]

// CHECK: [[M4]] = metadata !{i32 {{[0-9]*}}, metadata [[FUNC]], metadata [[CTXT]], i32 14} ; [ DW_TAG_imported_module ]



// FIXME: It is confused on win32 to generate file entry when dosish filename is given.

// REQUIRES: shell