diff options
| -rw-r--r-- | clang/lib/CodeGen/CodeGenModule.cpp | 4 | ||||
| -rw-r--r-- | clang/test/CodeGen/dwarf-version.c | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index 0e561693f20..25268efff61 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -470,9 +470,7 @@ void CodeGenModule::Release() { CodeGenOpts.NumRegisterParameters); if (CodeGenOpts.DwarfVersion) { - // We actually want the latest version when there are conflicts. - // We can change from Warning to Latest if such mode is supported. - getModule().addModuleFlag(llvm::Module::Warning, "Dwarf Version", + getModule().addModuleFlag(llvm::Module::Max, "Dwarf Version", CodeGenOpts.DwarfVersion); } if (CodeGenOpts.EmitCodeView) { diff --git a/clang/test/CodeGen/dwarf-version.c b/clang/test/CodeGen/dwarf-version.c index 10add21d88d..87143ee1311 100644 --- a/clang/test/CodeGen/dwarf-version.c +++ b/clang/test/CodeGen/dwarf-version.c @@ -38,10 +38,10 @@ int main (void) { // NOCODEVIEW-NOT: !"CodeView" -// VER2: !{i32 2, !"Dwarf Version", i32 2} -// VER3: !{i32 2, !"Dwarf Version", i32 3} -// VER4: !{i32 2, !"Dwarf Version", i32 4} -// VER5: !{i32 2, !"Dwarf Version", i32 5} +// VER2: !{i32 7, !"Dwarf Version", i32 2} +// VER3: !{i32 7, !"Dwarf Version", i32 3} +// VER4: !{i32 7, !"Dwarf Version", i32 4} +// VER5: !{i32 7, !"Dwarf Version", i32 5} // NODWARF-NOT: !"Dwarf Version" // CODEVIEW: !{i32 2, !"CodeView", i32 1} |
