Index: llvm/lib/MC/MCParser/AsmParser.cpp =================================================================== --- llvm/lib/MC/MCParser/AsmParser.cpp +++ llvm/lib/MC/MCParser/AsmParser.cpp @@ -3528,7 +3528,8 @@ Lex(); } - unsigned Flags = DWARF2_LINE_DEFAULT_IS_STMT ? DWARF2_FLAG_IS_STMT : 0; + auto PrevFlags = getContext().getCurrentDwarfLoc().getFlags(); + unsigned Flags = PrevFlags & DWARF2_FLAG_IS_STMT; unsigned Isa = 0; int64_t Discriminator = 0; Index: llvm/lib/MC/MCParser/MasmParser.cpp =================================================================== --- llvm/lib/MC/MCParser/MasmParser.cpp +++ llvm/lib/MC/MCParser/MasmParser.cpp @@ -3235,7 +3235,8 @@ Lex(); } - unsigned Flags = DWARF2_LINE_DEFAULT_IS_STMT ? DWARF2_FLAG_IS_STMT : 0; + auto PrevFlags = getContext().getCurrentDwarfLoc().getFlags(); + unsigned Flags = PrevFlags & DWARF2_FLAG_IS_STMT; unsigned Isa = 0; int64_t Discriminator = 0; Index: llvm/test/MC/AsmParser/directive_loc_2.s =================================================================== --- /dev/null +++ llvm/test/MC/AsmParser/directive_loc_2.s @@ -0,0 +1,30 @@ +# RUN: llvm-mc -triple i386-unknown-unknown -filetype=obj %s -o %t +# RUN: llvm-dwarfdump -debug-info -debug-line %t | FileCheck %s + + .file 1 "test.c" + .loc 1 2 + nop + .loc 1 4 is_stmt 0 + nop + .loc 1 6 + nop + .loc 1 8 is_stmt 1 + nop + .loc 1 10 + nop + + +# CHECK: .debug_info +# CHECK-EMPTY: +# CHECK_NEXT: .debug_line +# CHECK: file_names[ 1]: +# CHECK-NEXT: name: "test.c" +# CHECK-NEXT: dir_index: 0 +# CHECK: 0x{{0+}}0 2 0 1 0 0 is_stmt +# CHECK: 0x{{0+}}1 4 0 1 0 0 +# CHECK-NOT: is_stmt +# CHECK: 0x{{0+}}2 6 0 1 0 0 +# CHECK-NOT: is_stmt +# CHECK: 0x{{0+}}3 8 0 1 0 0 is_stmt +# CHECK: 0x{{0+}}4 10 0 1 0 0 is_stmt +# CHECK: 0x{{0+}}5 10 0 1 0 0 is_stmt end_sequence