Index: include/llvm/Support/Dwarf.h =================================================================== --- include/llvm/Support/Dwarf.h +++ include/llvm/Support/Dwarf.h @@ -21,6 +21,8 @@ namespace llvm { +class Module; + //===----------------------------------------------------------------------===// // Debug info constants. @@ -951,6 +953,9 @@ }; }; +/// Return Dwarf Version by checking module flags. +unsigned getDwarfVersionFromModule(const Module *M); + } // End of namespace dwarf } // End of namespace llvm Index: lib/CodeGen/AsmPrinter/DwarfDebug.cpp =================================================================== --- lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -168,14 +168,6 @@ } // end llvm namespace -/// Return Dwarf Version by checking module flags. -static unsigned getDwarfVersionFromModule(const Module *M) { - Value *Val = M->getModuleFlag("Dwarf Version"); - if (!Val) - return dwarf::DWARF_VERSION; - return cast(Val)->getZExtValue(); -} - DwarfDebug::DwarfDebug(AsmPrinter *A, Module *M) : Asm(A), MMI(Asm->MMI), FirstCU(0), PrevLabel(NULL), GlobalRangeCount(0), InfoHolder(A, "info_string", DIEValueAllocator), @@ -211,7 +203,7 @@ DwarfVersion = DwarfVersionNumber ? DwarfVersionNumber - : getDwarfVersionFromModule(MMI->getModule()); + : dwarf::getDwarfVersionFromModule(MMI->getModule()); { NamedRegionTimer T(DbgTimerName, DWARFGroupName, TimePassesIsEnabled); Index: lib/Support/Dwarf.cpp =================================================================== --- lib/Support/Dwarf.cpp +++ lib/Support/Dwarf.cpp @@ -13,6 +13,8 @@ #include "llvm/Support/Dwarf.h" #include "llvm/Support/ErrorHandling.h" +#include "llvm/IR/Module.h" +#include "llvm/IR/Constants.h" using namespace llvm; using namespace dwarf; @@ -795,3 +797,10 @@ } llvm_unreachable("Unknown GDBIndexEntryLinkage value"); } + +unsigned getDwarfVersionFromModule(const Module *M) { + Value *Val = M->getModuleFlag("Dwarf Version"); + if (!Val) + return llvm::dwarf::DWARF_VERSION; + return cast(Val)->getZExtValue(); +} Index: lib/Transforms/Utils/AddDiscriminators.cpp =================================================================== --- lib/Transforms/Utils/AddDiscriminators.cpp +++ lib/Transforms/Utils/AddDiscriminators.cpp @@ -65,6 +65,7 @@ #include "llvm/Pass.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/Debug.h" +#include "llvm/Support/Dwarf.h" #include "llvm/Support/raw_ostream.h" using namespace llvm; @@ -157,7 +158,12 @@ // No need to do anything if there is no debug info for this function. // If the function has debug information, but the user has disabled // discriminators, do nothing. - if (!hasDebugInfo(F) || NoDiscriminators) return false; + // Finally, if this module is built with dwarf versions earlier than 4, + // do nothing (discriminator support is a DWARF 4 feature). + if (!hasDebugInfo(F) || + dwarf::getDwarfVersionFromModule(F.getParent()) < 4 || + NoDiscriminators) + return false; bool Changed = false; Module *M = F.getParent(); Index: test/Transforms/AddDiscriminators/no-discriminators.ll =================================================================== --- /dev/null +++ test/Transforms/AddDiscriminators/no-discriminators.ll @@ -0,0 +1,71 @@ +; RUN: opt < %s -add-discriminators -S | FileCheck %s + +; We should not generate discriminators for DWARF versions prior to 4. +; +; Original code: +; +; int foo(long i) { +; if (i < 5) return 2; else return 90; +; } +; +; None of the !dbg nodes associated with the if() statement should be +; altered. If they are, it means that the discriminators pass added a +; new lexical scope. + +define i32 @foo(i64 %i) #0 { +entry: + %retval = alloca i32, align 4 + %i.addr = alloca i64, align 8 + store i64 %i, i64* %i.addr, align 8 + call void @llvm.dbg.declare(metadata !{i64* %i.addr}, metadata !13), !dbg !14 + %0 = load i64* %i.addr, align 8, !dbg !15 +; CHECK: %0 = load i64* %i.addr, align 8, !dbg !15 + %cmp = icmp slt i64 %0, 5, !dbg !15 +; CHECK: %cmp = icmp slt i64 %0, 5, !dbg !15 + br i1 %cmp, label %if.then, label %if.else, !dbg !15 +; CHECK: br i1 %cmp, label %if.then, label %if.else, !dbg !15 + +if.then: ; preds = %entry + store i32 2, i32* %retval, !dbg !15 + br label %return, !dbg !15 + +if.else: ; preds = %entry + store i32 90, i32* %retval, !dbg !15 + br label %return, !dbg !15 + +return: ; preds = %if.else, %if.then + %1 = load i32* %retval, !dbg !17 + ret i32 %1, !dbg !17 +} + +; Function Attrs: nounwind readnone +declare void @llvm.dbg.declare(metadata, metadata) #1 + +attributes #0 = { nounwind uwtable "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" } +attributes #1 = { nounwind readnone } + +!llvm.dbg.cu = !{!0} +!llvm.module.flags = !{!10, !11} +!llvm.ident = !{!12} + +!0 = metadata !{i32 786449, metadata !1, i32 12, metadata !"clang version 3.5.0 ", i1 false, metadata !"", i32 0, metadata !2, metadata !2, metadata !3, metadata !2, metadata !2, metadata !"", i32 1} ; [ DW_TAG_compile_unit ] [./no-discriminators] [DW_LANG_C99] +!1 = metadata !{metadata !"no-discriminators", metadata !"."} +!2 = metadata !{} +!3 = metadata !{metadata !4} +!4 = metadata !{i32 786478, metadata !1, metadata !5, metadata !"foo", metadata !"foo", metadata !"", i32 1, metadata !6, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, i32 (i64)* @foo, null, null, metadata !2, i32 1} ; [ DW_TAG_subprogram ] [line 1] [def] [foo] +!5 = metadata !{i32 786473, metadata !1} ; [ DW_TAG_file_type ] [./no-discriminators] +!6 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !7, i32 0, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ] +!7 = metadata !{metadata !8, metadata !9} +!8 = metadata !{i32 786468, null, null, metadata !"int", i32 0, i64 32, i64 32, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed] +!9 = metadata !{i32 786468, null, null, metadata !"long int", i32 0, i64 64, i64 64, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] [long int] [line 0, size 64, align 64, offset 0, enc DW_ATE_signed] +!10 = metadata !{i32 2, metadata !"Dwarf Version", i32 2} +; CHECK: !10 = metadata !{i32 2, metadata !"Dwarf Version", i32 2} +!11 = metadata !{i32 1, metadata !"Debug Info Version", i32 1} +!12 = metadata !{metadata !"clang version 3.5.0 "} +!13 = metadata !{i32 786689, metadata !4, metadata !"i", metadata !5, i32 16777217, metadata !9, i32 0, i32 0} ; [ DW_TAG_arg_variable ] [i] [line 1] +!14 = metadata !{i32 1, i32 0, metadata !4, null} +!15 = metadata !{i32 2, i32 0, metadata !16, null} +; CHECK: !15 = metadata !{i32 2, i32 0, metadata !16, null} +!16 = metadata !{i32 786443, metadata !1, metadata !4, i32 2, i32 0, i32 0, i32 0} ; [ DW_TAG_lexical_block ] [./no-discriminators] +; CHECK: !16 = metadata !{i32 786443, metadata !1, metadata !4, i32 2, i32 0, i32 0, i32 0} ; [ DW_TAG_lexical_block ] [./no-discriminators] +!17 = metadata !{i32 3, i32 0, metadata !4, null}