From 31bd47909fca2c08acd4594916ecbafe9aef2c5b Mon Sep 17 00:00:00 2001 From: Ofek Date: Sat, 11 Nov 2023 14:56:25 +0200 Subject: [PATCH] Fix #4931 and #2218 (#5706) --- lib/parsers/asm-parser.ts | 5 +- .../avr-loop.asm.directives.approved.txt | 3 + ...-loop.asm.directives.comments.approved.txt | 3 + ...vr-loop.asm.directives.labels.approved.txt | 32 +++- ...sm.directives.labels.comments.approved.txt | 32 +++- ...tives.labels.comments.library.approved.txt | 32 +++- ...nts.library.dontMaskFilenames.approved.txt | 32 +++- ...r-loop.asm.directives.library.approved.txt | 3 + .../avr-loop.asm.none.approved.txt | 1 + .../bug-577_icc.asm.directives.approved.txt | 3 + ...7_icc.asm.directives.comments.approved.txt | 3 + ...577_icc.asm.directives.labels.approved.txt | 18 ++ ...sm.directives.labels.comments.approved.txt | 18 ++ ...tives.labels.comments.library.approved.txt | 18 ++ ...nts.library.dontMaskFilenames.approved.txt | 18 ++ ...77_icc.asm.directives.library.approved.txt | 3 + .../bug-577_icc.asm.none.approved.txt | 3 + .../bug-660.asm.directives.approved.txt | 2 + ...g-660.asm.directives.comments.approved.txt | 2 + ...bug-660.asm.directives.labels.approved.txt | 14 +- ...sm.directives.labels.comments.approved.txt | 14 +- ...tives.labels.comments.library.approved.txt | 14 +- ...nts.library.dontMaskFilenames.approved.txt | 14 +- ...ug-660.asm.directives.library.approved.txt | 2 + .../cc65-bin.asm.directives.approved.txt | 1 + ...5-bin.asm.directives.comments.approved.txt | 1 + ...c65-bin.asm.directives.labels.approved.txt | 62 +++---- ...sm.directives.labels.comments.approved.txt | 62 +++---- ...tives.labels.comments.library.approved.txt | 62 +++---- ...nts.library.dontMaskFilenames.approved.txt | 62 +++---- ...65-bin.asm.directives.library.approved.txt | 1 + .../clang-hellow.asm.directives.approved.txt | 104 ++++++++++++ ...ellow.asm.directives.comments.approved.txt | 104 ++++++++++++ ...-hellow.asm.directives.labels.approved.txt | 124 ++++++++++++++ ...sm.directives.labels.comments.approved.txt | 124 ++++++++++++++ ...tives.labels.comments.library.approved.txt | 124 ++++++++++++++ ...nts.library.dontMaskFilenames.approved.txt | 124 ++++++++++++++ ...hellow.asm.directives.library.approved.txt | 104 ++++++++++++ .../clang-on-mac.asm.directives.approved.txt | 143 ++++++++++++++++ ...n-mac.asm.directives.comments.approved.txt | 143 ++++++++++++++++ ...-on-mac.asm.directives.labels.approved.txt | 158 ++++++++++++++++++ ...sm.directives.labels.comments.approved.txt | 158 ++++++++++++++++++ ...tives.labels.comments.library.approved.txt | 158 ++++++++++++++++++ ...nts.library.dontMaskFilenames.approved.txt | 158 ++++++++++++++++++ ...on-mac.asm.directives.library.approved.txt | 143 ++++++++++++++++ .../diab.asm.directives.approved.txt | 1 + .../diab.asm.directives.comments.approved.txt | 1 + .../diab.asm.directives.labels.approved.txt | 6 + ...sm.directives.labels.comments.approved.txt | 6 + ...tives.labels.comments.library.approved.txt | 6 + ...nts.library.dontMaskFilenames.approved.txt | 6 + .../diab.asm.directives.library.approved.txt | 1 + .../gcc-avr-sum.asm.directives.approved.txt | 2 + ...r-sum.asm.directives.comments.approved.txt | 2 + ...avr-sum.asm.directives.labels.approved.txt | 24 ++- ...sm.directives.labels.comments.approved.txt | 24 ++- ...tives.labels.comments.library.approved.txt | 24 ++- ...nts.library.dontMaskFilenames.approved.txt | 24 ++- ...vr-sum.asm.directives.library.approved.txt | 2 + .../gcc-avr-sum.asm.none.approved.txt | 1 + .../icc.hellow.asm.directives.approved.txt | 15 ++ ...ellow.asm.directives.comments.approved.txt | 15 ++ ....hellow.asm.directives.labels.approved.txt | 94 ++++++++++- ...sm.directives.labels.comments.approved.txt | 94 ++++++++++- ...tives.labels.comments.library.approved.txt | 94 ++++++++++- ...nts.library.dontMaskFilenames.approved.txt | 94 ++++++++++- ...hellow.asm.directives.library.approved.txt | 15 ++ .../icc.hellow.asm.none.approved.txt | 10 ++ ...llvm-ir-bug957.asm.directives.approved.txt | 3 +- ...ug957.asm.directives.comments.approved.txt | 3 +- ...-bug957.asm.directives.labels.approved.txt | 17 +- ...sm.directives.labels.comments.approved.txt | 17 +- ...tives.labels.comments.library.approved.txt | 17 +- ...nts.library.dontMaskFilenames.approved.txt | 17 +- ...bug957.asm.directives.library.approved.txt | 3 +- .../mips5-square.asm.directives.approved.txt | 1 + ...quare.asm.directives.comments.approved.txt | 1 + ...-square.asm.directives.labels.approved.txt | 8 +- ...sm.directives.labels.comments.approved.txt | 8 +- ...tives.labels.comments.library.approved.txt | 8 +- ...nts.library.dontMaskFilenames.approved.txt | 8 +- ...square.asm.directives.library.approved.txt | 1 + 82 files changed, 2886 insertions(+), 196 deletions(-) diff --git a/lib/parsers/asm-parser.ts b/lib/parsers/asm-parser.ts index f9f159f6c9f..77d1c3216b9 100644 --- a/lib/parsers/asm-parser.ts +++ b/lib/parsers/asm-parser.ts @@ -612,7 +612,10 @@ export class AsmParser extends AsmRegex implements IAsmParser { } if (match) { // It's a label definition. - if (labelsUsed[match[1]] === undefined) { + + // g-as shows local labels as eg: "1: call mcount". We characterize such a label as + // "the label-matching part doesn't equal the whole line" and treat it as used. + if (labelsUsed[match[1]] === undefined && match[0] === line) { // It's an unused label. if (filters.labels) { continue; diff --git a/test/filters-cases/avr-loop.asm.directives.approved.txt b/test/filters-cases/avr-loop.asm.directives.approved.txt index 30a4b1eecd0..4cdb0a31fa0 100644 --- a/test/filters-cases/avr-loop.asm.directives.approved.txt +++ b/test/filters-cases/avr-loop.asm.directives.approved.txt @@ -600,8 +600,11 @@ ".L2": 45, ".L3": 54, ".L4": 30, + ".L__stack_usage": 20, + "__CCP__": 4, "__SP_H__": 2, "__SP_L__": 3, + "__SREG__": 1, "__tmp_reg__": 5, "__zero_reg__": 6 } diff --git a/test/filters-cases/avr-loop.asm.directives.comments.approved.txt b/test/filters-cases/avr-loop.asm.directives.comments.approved.txt index d595d1ea1f8..8aede4552a4 100644 --- a/test/filters-cases/avr-loop.asm.directives.comments.approved.txt +++ b/test/filters-cases/avr-loop.asm.directives.comments.approved.txt @@ -580,8 +580,11 @@ ".L2": 42, ".L3": 51, ".L4": 27, + ".L__stack_usage": 17, + "__CCP__": 4, "__SP_H__": 2, "__SP_L__": 3, + "__SREG__": 1, "__tmp_reg__": 5, "__zero_reg__": 6 } diff --git a/test/filters-cases/avr-loop.asm.directives.labels.approved.txt b/test/filters-cases/avr-loop.asm.directives.labels.approved.txt index e77366f9214..84f72c619a8 100644 --- a/test/filters-cases/avr-loop.asm.directives.labels.approved.txt +++ b/test/filters-cases/avr-loop.asm.directives.labels.approved.txt @@ -1,5 +1,10 @@ { "asm": [ + { + "labels": [], + "source": null, + "text": "__SREG__ = 0x3f" + }, { "labels": [], "source": null, @@ -10,6 +15,11 @@ "source": null, "text": "__SP_L__ = 0x3d" }, + { + "labels": [], + "source": null, + "text": "__CCP__ = 0x34" + }, { "labels": [], "source": null, @@ -104,6 +114,11 @@ "source": null, "text": "/* stack size = 6 */" }, + { + "labels": [], + "source": null, + "text": ".L__stack_usage = 6" + }, { "labels": [ { @@ -502,12 +517,15 @@ } ], "labelDefinitions": { - ".L2": 33, - ".L3": 41, - ".L4": 20, - "__SP_H__": 1, - "__SP_L__": 2, - "__tmp_reg__": 3, - "__zero_reg__": 4 + ".L2": 36, + ".L3": 44, + ".L4": 23, + ".L__stack_usage": 17, + "__CCP__": 4, + "__SP_H__": 2, + "__SP_L__": 3, + "__SREG__": 1, + "__tmp_reg__": 5, + "__zero_reg__": 6 } } diff --git a/test/filters-cases/avr-loop.asm.directives.labels.comments.approved.txt b/test/filters-cases/avr-loop.asm.directives.labels.comments.approved.txt index 68c2fe416a8..2ce8718953f 100644 --- a/test/filters-cases/avr-loop.asm.directives.labels.comments.approved.txt +++ b/test/filters-cases/avr-loop.asm.directives.labels.comments.approved.txt @@ -1,5 +1,10 @@ { "asm": [ + { + "labels": [], + "source": null, + "text": "__SREG__ = 0x3f" + }, { "labels": [], "source": null, @@ -10,6 +15,11 @@ "source": null, "text": "__SP_L__ = 0x3d" }, + { + "labels": [], + "source": null, + "text": "__CCP__ = 0x34" + }, { "labels": [], "source": null, @@ -89,6 +99,11 @@ }, "text": " in r29,__SP_H__" }, + { + "labels": [], + "source": null, + "text": ".L__stack_usage = 6" + }, { "labels": [ { @@ -482,12 +497,15 @@ } ], "labelDefinitions": { - ".L2": 30, - ".L3": 38, - ".L4": 17, - "__SP_H__": 1, - "__SP_L__": 2, - "__tmp_reg__": 3, - "__zero_reg__": 4 + ".L2": 33, + ".L3": 41, + ".L4": 20, + ".L__stack_usage": 14, + "__CCP__": 4, + "__SP_H__": 2, + "__SP_L__": 3, + "__SREG__": 1, + "__tmp_reg__": 5, + "__zero_reg__": 6 } } diff --git a/test/filters-cases/avr-loop.asm.directives.labels.comments.library.approved.txt b/test/filters-cases/avr-loop.asm.directives.labels.comments.library.approved.txt index 68c2fe416a8..2ce8718953f 100644 --- a/test/filters-cases/avr-loop.asm.directives.labels.comments.library.approved.txt +++ b/test/filters-cases/avr-loop.asm.directives.labels.comments.library.approved.txt @@ -1,5 +1,10 @@ { "asm": [ + { + "labels": [], + "source": null, + "text": "__SREG__ = 0x3f" + }, { "labels": [], "source": null, @@ -10,6 +15,11 @@ "source": null, "text": "__SP_L__ = 0x3d" }, + { + "labels": [], + "source": null, + "text": "__CCP__ = 0x34" + }, { "labels": [], "source": null, @@ -89,6 +99,11 @@ }, "text": " in r29,__SP_H__" }, + { + "labels": [], + "source": null, + "text": ".L__stack_usage = 6" + }, { "labels": [ { @@ -482,12 +497,15 @@ } ], "labelDefinitions": { - ".L2": 30, - ".L3": 38, - ".L4": 17, - "__SP_H__": 1, - "__SP_L__": 2, - "__tmp_reg__": 3, - "__zero_reg__": 4 + ".L2": 33, + ".L3": 41, + ".L4": 20, + ".L__stack_usage": 14, + "__CCP__": 4, + "__SP_H__": 2, + "__SP_L__": 3, + "__SREG__": 1, + "__tmp_reg__": 5, + "__zero_reg__": 6 } } diff --git a/test/filters-cases/avr-loop.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt b/test/filters-cases/avr-loop.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt index 68c2fe416a8..2ce8718953f 100644 --- a/test/filters-cases/avr-loop.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt +++ b/test/filters-cases/avr-loop.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt @@ -1,5 +1,10 @@ { "asm": [ + { + "labels": [], + "source": null, + "text": "__SREG__ = 0x3f" + }, { "labels": [], "source": null, @@ -10,6 +15,11 @@ "source": null, "text": "__SP_L__ = 0x3d" }, + { + "labels": [], + "source": null, + "text": "__CCP__ = 0x34" + }, { "labels": [], "source": null, @@ -89,6 +99,11 @@ }, "text": " in r29,__SP_H__" }, + { + "labels": [], + "source": null, + "text": ".L__stack_usage = 6" + }, { "labels": [ { @@ -482,12 +497,15 @@ } ], "labelDefinitions": { - ".L2": 30, - ".L3": 38, - ".L4": 17, - "__SP_H__": 1, - "__SP_L__": 2, - "__tmp_reg__": 3, - "__zero_reg__": 4 + ".L2": 33, + ".L3": 41, + ".L4": 20, + ".L__stack_usage": 14, + "__CCP__": 4, + "__SP_H__": 2, + "__SP_L__": 3, + "__SREG__": 1, + "__tmp_reg__": 5, + "__zero_reg__": 6 } } diff --git a/test/filters-cases/avr-loop.asm.directives.library.approved.txt b/test/filters-cases/avr-loop.asm.directives.library.approved.txt index 30a4b1eecd0..4cdb0a31fa0 100644 --- a/test/filters-cases/avr-loop.asm.directives.library.approved.txt +++ b/test/filters-cases/avr-loop.asm.directives.library.approved.txt @@ -600,8 +600,11 @@ ".L2": 45, ".L3": 54, ".L4": 30, + ".L__stack_usage": 20, + "__CCP__": 4, "__SP_H__": 2, "__SP_L__": 3, + "__SREG__": 1, "__tmp_reg__": 5, "__zero_reg__": 6 } diff --git a/test/filters-cases/avr-loop.asm.none.approved.txt b/test/filters-cases/avr-loop.asm.none.approved.txt index 930bd258e2c..ab20e383237 100644 --- a/test/filters-cases/avr-loop.asm.none.approved.txt +++ b/test/filters-cases/avr-loop.asm.none.approved.txt @@ -1102,6 +1102,7 @@ ".LM5": 88, ".LM6": 101, ".LM7": 107, + ".L__stack_usage": 57, ".Letext0": 126, ".Lscope1": 122, ".Ltext0": 11, diff --git a/test/filters-cases/bug-577_icc.asm.directives.approved.txt b/test/filters-cases/bug-577_icc.asm.directives.approved.txt index 27df63f944a..a33eb588c81 100644 --- a/test/filters-cases/bug-577_icc.asm.directives.approved.txt +++ b/test/filters-cases/bug-577_icc.asm.directives.approved.txt @@ -531,6 +531,9 @@ } ], "labelDefinitions": { + "..B1.1": 13, + "..B1.4": 38, + "..B1.5": 28, "_Z6squarei": 11 } } diff --git a/test/filters-cases/bug-577_icc.asm.directives.comments.approved.txt b/test/filters-cases/bug-577_icc.asm.directives.comments.approved.txt index 2b4b34a07f0..1dead81d94f 100644 --- a/test/filters-cases/bug-577_icc.asm.directives.comments.approved.txt +++ b/test/filters-cases/bug-577_icc.asm.directives.comments.approved.txt @@ -231,6 +231,9 @@ } ], "labelDefinitions": { + "..B1.1": 6, + "..B1.4": 22, + "..B1.5": 18, "_Z6squarei": 5 } } diff --git a/test/filters-cases/bug-577_icc.asm.directives.labels.approved.txt b/test/filters-cases/bug-577_icc.asm.directives.labels.approved.txt index 6d10793883e..efab4eea7ab 100644 --- a/test/filters-cases/bug-577_icc.asm.directives.labels.approved.txt +++ b/test/filters-cases/bug-577_icc.asm.directives.labels.approved.txt @@ -45,6 +45,11 @@ "source": null, "text": "# parameter 1(num): edi" }, + { + "labels": [], + "source": null, + "text": "..B1.1: # Preds ..B1.0" + }, { "labels": [], "source": null, @@ -92,6 +97,11 @@ "source": null, "text": " # LOE rbx rbp rsp r12 r13 r14 r15 rip" }, + { + "labels": [], + "source": null, + "text": "..B1.5: # Preds ..B1.1" + }, { "labels": [], "source": null, @@ -122,6 +132,11 @@ "source": null, "text": " # LOE rbx rbp rsp r12 r13 r14 r15 rip" }, + { + "labels": [], + "source": null, + "text": "..B1.4: # Preds ..B1.5" + }, { "labels": [], "source": null, @@ -376,6 +391,9 @@ } ], "labelDefinitions": { + "..B1.1": 10, + "..B1.4": 25, + "..B1.5": 18, "_Z6squarei": 8 } } diff --git a/test/filters-cases/bug-577_icc.asm.directives.labels.comments.approved.txt b/test/filters-cases/bug-577_icc.asm.directives.labels.comments.approved.txt index 81d0ebb82d0..ce5c5557897 100644 --- a/test/filters-cases/bug-577_icc.asm.directives.labels.comments.approved.txt +++ b/test/filters-cases/bug-577_icc.asm.directives.labels.comments.approved.txt @@ -5,6 +5,11 @@ "source": null, "text": "_Z6squarei:" }, + { + "labels": [], + "source": null, + "text": "..B1.1: # Preds ..B1.0" + }, { "labels": [], "source": { @@ -37,6 +42,16 @@ }, "text": " mov DWORD PTR [-16+rbp], edi #2.21" }, + { + "labels": [], + "source": null, + "text": "..B1.5: # Preds ..B1.1" + }, + { + "labels": [], + "source": null, + "text": "..B1.4: # Preds ..B1.5" + }, { "labels": [], "source": { @@ -71,6 +86,9 @@ } ], "labelDefinitions": { + "..B1.1": 2, + "..B1.4": 8, + "..B1.5": 7, "_Z6squarei": 1 } } diff --git a/test/filters-cases/bug-577_icc.asm.directives.labels.comments.library.approved.txt b/test/filters-cases/bug-577_icc.asm.directives.labels.comments.library.approved.txt index 81d0ebb82d0..ce5c5557897 100644 --- a/test/filters-cases/bug-577_icc.asm.directives.labels.comments.library.approved.txt +++ b/test/filters-cases/bug-577_icc.asm.directives.labels.comments.library.approved.txt @@ -5,6 +5,11 @@ "source": null, "text": "_Z6squarei:" }, + { + "labels": [], + "source": null, + "text": "..B1.1: # Preds ..B1.0" + }, { "labels": [], "source": { @@ -37,6 +42,16 @@ }, "text": " mov DWORD PTR [-16+rbp], edi #2.21" }, + { + "labels": [], + "source": null, + "text": "..B1.5: # Preds ..B1.1" + }, + { + "labels": [], + "source": null, + "text": "..B1.4: # Preds ..B1.5" + }, { "labels": [], "source": { @@ -71,6 +86,9 @@ } ], "labelDefinitions": { + "..B1.1": 2, + "..B1.4": 8, + "..B1.5": 7, "_Z6squarei": 1 } } diff --git a/test/filters-cases/bug-577_icc.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt b/test/filters-cases/bug-577_icc.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt index d54edb60531..0f2225fe923 100644 --- a/test/filters-cases/bug-577_icc.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt +++ b/test/filters-cases/bug-577_icc.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt @@ -5,6 +5,11 @@ "source": null, "text": "_Z6squarei:" }, + { + "labels": [], + "source": null, + "text": "..B1.1: # Preds ..B1.0" + }, { "labels": [], "source": { @@ -41,6 +46,16 @@ }, "text": " mov DWORD PTR [-16+rbp], edi #2.21" }, + { + "labels": [], + "source": null, + "text": "..B1.5: # Preds ..B1.1" + }, + { + "labels": [], + "source": null, + "text": "..B1.4: # Preds ..B1.5" + }, { "labels": [], "source": { @@ -79,6 +94,9 @@ } ], "labelDefinitions": { + "..B1.1": 2, + "..B1.4": 8, + "..B1.5": 7, "_Z6squarei": 1 } } diff --git a/test/filters-cases/bug-577_icc.asm.directives.library.approved.txt b/test/filters-cases/bug-577_icc.asm.directives.library.approved.txt index 27df63f944a..a33eb588c81 100644 --- a/test/filters-cases/bug-577_icc.asm.directives.library.approved.txt +++ b/test/filters-cases/bug-577_icc.asm.directives.library.approved.txt @@ -531,6 +531,9 @@ } ], "labelDefinitions": { + "..B1.1": 13, + "..B1.4": 38, + "..B1.5": 28, "_Z6squarei": 11 } } diff --git a/test/filters-cases/bug-577_icc.asm.none.approved.txt b/test/filters-cases/bug-577_icc.asm.none.approved.txt index e515ea0e979..3fc90fad0c8 100644 --- a/test/filters-cases/bug-577_icc.asm.none.approved.txt +++ b/test/filters-cases/bug-577_icc.asm.none.approved.txt @@ -1643,6 +1643,9 @@ } ], "labelDefinitions": { + "..B1.1": 19, + "..B1.4": 52, + "..B1.5": 41, "..L3": 24, "..LN0": 26, "..LN_Z6squarei.13": 72, diff --git a/test/filters-cases/bug-660.asm.directives.approved.txt b/test/filters-cases/bug-660.asm.directives.approved.txt index 85e459fd823..7f4ca4c2967 100644 --- a/test/filters-cases/bug-660.asm.directives.approved.txt +++ b/test/filters-cases/bug-660.asm.directives.approved.txt @@ -457,6 +457,8 @@ ], "labelDefinitions": { "$LC0": 2, + "$LFB12": 4, + "$LVL0": 13, "main": 5 } } diff --git a/test/filters-cases/bug-660.asm.directives.comments.approved.txt b/test/filters-cases/bug-660.asm.directives.comments.approved.txt index 85e459fd823..7f4ca4c2967 100644 --- a/test/filters-cases/bug-660.asm.directives.comments.approved.txt +++ b/test/filters-cases/bug-660.asm.directives.comments.approved.txt @@ -457,6 +457,8 @@ ], "labelDefinitions": { "$LC0": 2, + "$LFB12": 4, + "$LVL0": 13, "main": 5 } } diff --git a/test/filters-cases/bug-660.asm.directives.labels.approved.txt b/test/filters-cases/bug-660.asm.directives.labels.approved.txt index d50918d8bfb..a11f664d747 100644 --- a/test/filters-cases/bug-660.asm.directives.labels.approved.txt +++ b/test/filters-cases/bug-660.asm.directives.labels.approved.txt @@ -10,6 +10,11 @@ "source": null, "text": " .ascii \"hello world\\000\"" }, + { + "labels": [], + "source": null, + "text": "$LFB12 = ." + }, { "labels": [], "source": null, @@ -84,6 +89,11 @@ "source": null, "text": "" }, + { + "labels": [], + "source": null, + "text": "$LVL0 = ." + }, { "labels": [], "source": { @@ -132,6 +142,8 @@ ], "labelDefinitions": { "$LC0": 1, - "main": 3 + "$LFB12": 3, + "$LVL0": 12, + "main": 4 } } diff --git a/test/filters-cases/bug-660.asm.directives.labels.comments.approved.txt b/test/filters-cases/bug-660.asm.directives.labels.comments.approved.txt index d50918d8bfb..a11f664d747 100644 --- a/test/filters-cases/bug-660.asm.directives.labels.comments.approved.txt +++ b/test/filters-cases/bug-660.asm.directives.labels.comments.approved.txt @@ -10,6 +10,11 @@ "source": null, "text": " .ascii \"hello world\\000\"" }, + { + "labels": [], + "source": null, + "text": "$LFB12 = ." + }, { "labels": [], "source": null, @@ -84,6 +89,11 @@ "source": null, "text": "" }, + { + "labels": [], + "source": null, + "text": "$LVL0 = ." + }, { "labels": [], "source": { @@ -132,6 +142,8 @@ ], "labelDefinitions": { "$LC0": 1, - "main": 3 + "$LFB12": 3, + "$LVL0": 12, + "main": 4 } } diff --git a/test/filters-cases/bug-660.asm.directives.labels.comments.library.approved.txt b/test/filters-cases/bug-660.asm.directives.labels.comments.library.approved.txt index d50918d8bfb..a11f664d747 100644 --- a/test/filters-cases/bug-660.asm.directives.labels.comments.library.approved.txt +++ b/test/filters-cases/bug-660.asm.directives.labels.comments.library.approved.txt @@ -10,6 +10,11 @@ "source": null, "text": " .ascii \"hello world\\000\"" }, + { + "labels": [], + "source": null, + "text": "$LFB12 = ." + }, { "labels": [], "source": null, @@ -84,6 +89,11 @@ "source": null, "text": "" }, + { + "labels": [], + "source": null, + "text": "$LVL0 = ." + }, { "labels": [], "source": { @@ -132,6 +142,8 @@ ], "labelDefinitions": { "$LC0": 1, - "main": 3 + "$LFB12": 3, + "$LVL0": 12, + "main": 4 } } diff --git a/test/filters-cases/bug-660.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt b/test/filters-cases/bug-660.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt index b4ab04884fd..20d0f2c4c0b 100644 --- a/test/filters-cases/bug-660.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt +++ b/test/filters-cases/bug-660.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt @@ -10,6 +10,11 @@ "source": null, "text": " .ascii \"hello world\\000\"" }, + { + "labels": [], + "source": null, + "text": "$LFB12 = ." + }, { "labels": [], "source": null, @@ -90,6 +95,11 @@ "source": null, "text": "" }, + { + "labels": [], + "source": null, + "text": "$LVL0 = ." + }, { "labels": [], "source": { @@ -143,6 +153,8 @@ ], "labelDefinitions": { "$LC0": 1, - "main": 3 + "$LFB12": 3, + "$LVL0": 12, + "main": 4 } } diff --git a/test/filters-cases/bug-660.asm.directives.library.approved.txt b/test/filters-cases/bug-660.asm.directives.library.approved.txt index 85e459fd823..7f4ca4c2967 100644 --- a/test/filters-cases/bug-660.asm.directives.library.approved.txt +++ b/test/filters-cases/bug-660.asm.directives.library.approved.txt @@ -457,6 +457,8 @@ ], "labelDefinitions": { "$LC0": 2, + "$LFB12": 4, + "$LVL0": 13, "main": 5 } } diff --git a/test/filters-cases/cc65-bin.asm.directives.approved.txt b/test/filters-cases/cc65-bin.asm.directives.approved.txt index ba192dbdd9a..d12c08449fa 100644 --- a/test/filters-cases/cc65-bin.asm.directives.approved.txt +++ b/test/filters-cases/cc65-bin.asm.directives.approved.txt @@ -25555,6 +25555,7 @@ "L602B": 59, "L6038": 67, "L6044": 74, + "L6066": 93, "L6068": 96, "L608D": 113, "L6095": 117, diff --git a/test/filters-cases/cc65-bin.asm.directives.comments.approved.txt b/test/filters-cases/cc65-bin.asm.directives.comments.approved.txt index 53ab4cef4c4..4e2c34304f4 100644 --- a/test/filters-cases/cc65-bin.asm.directives.comments.approved.txt +++ b/test/filters-cases/cc65-bin.asm.directives.comments.approved.txt @@ -25530,6 +25530,7 @@ "L602B": 54, "L6038": 62, "L6044": 69, + "L6066": 88, "L6068": 91, "L608D": 108, "L6095": 112, diff --git a/test/filters-cases/cc65-bin.asm.directives.labels.approved.txt b/test/filters-cases/cc65-bin.asm.directives.labels.approved.txt index 0f332a251b8..d12c08449fa 100644 --- a/test/filters-cases/cc65-bin.asm.directives.labels.approved.txt +++ b/test/filters-cases/cc65-bin.asm.directives.labels.approved.txt @@ -476,6 +476,11 @@ "source": null, "text": " .byte $4C" }, + { + "labels": [], + "source": null, + "text": "L6066: .byte $04" + }, { "labels": [], "source": null, @@ -25550,33 +25555,34 @@ "L602B": 59, "L6038": 67, "L6044": 74, - "L6068": 95, - "L608D": 112, - "L6095": 116, - "L60B7": 133, - "L60E4": 152, - "L60EC": 156, - "L610E": 173, - "L615C": 210, - "L6175": 224, - "L6178": 226, - "L6185": 233, - "L6195": 244, - "L619B": 249, - "L61AC": 261, - "L61BF": 277, - "L61C6": 282, - "L61F0": 306, - "L61F7": 309, - "L626A": 356, - "L627F": 369, - "L6298": 385, - "L62A2": 391, - "L62AB": 396, - "L62CE": 417, - "L6460": 806, - "L6666": 1324, - "L6C6C": 2866, - "L707C": 3906 + "L6066": 93, + "L6068": 96, + "L608D": 113, + "L6095": 117, + "L60B7": 134, + "L60E4": 153, + "L60EC": 157, + "L610E": 174, + "L615C": 211, + "L6175": 225, + "L6178": 227, + "L6185": 234, + "L6195": 245, + "L619B": 250, + "L61AC": 262, + "L61BF": 278, + "L61C6": 283, + "L61F0": 307, + "L61F7": 310, + "L626A": 357, + "L627F": 370, + "L6298": 386, + "L62A2": 392, + "L62AB": 397, + "L62CE": 418, + "L6460": 807, + "L6666": 1325, + "L6C6C": 2867, + "L707C": 3907 } } diff --git a/test/filters-cases/cc65-bin.asm.directives.labels.comments.approved.txt b/test/filters-cases/cc65-bin.asm.directives.labels.comments.approved.txt index 5045154c65f..4e2c34304f4 100644 --- a/test/filters-cases/cc65-bin.asm.directives.labels.comments.approved.txt +++ b/test/filters-cases/cc65-bin.asm.directives.labels.comments.approved.txt @@ -451,6 +451,11 @@ "source": null, "text": " .byte $4C" }, + { + "labels": [], + "source": null, + "text": "L6066: .byte $04" + }, { "labels": [], "source": null, @@ -25525,33 +25530,34 @@ "L602B": 54, "L6038": 62, "L6044": 69, - "L6068": 90, - "L608D": 107, - "L6095": 111, - "L60B7": 128, - "L60E4": 147, - "L60EC": 151, - "L610E": 168, - "L615C": 205, - "L6175": 219, - "L6178": 221, - "L6185": 228, - "L6195": 239, - "L619B": 244, - "L61AC": 256, - "L61BF": 272, - "L61C6": 277, - "L61F0": 301, - "L61F7": 304, - "L626A": 351, - "L627F": 364, - "L6298": 380, - "L62A2": 386, - "L62AB": 391, - "L62CE": 412, - "L6460": 801, - "L6666": 1319, - "L6C6C": 2861, - "L707C": 3901 + "L6066": 88, + "L6068": 91, + "L608D": 108, + "L6095": 112, + "L60B7": 129, + "L60E4": 148, + "L60EC": 152, + "L610E": 169, + "L615C": 206, + "L6175": 220, + "L6178": 222, + "L6185": 229, + "L6195": 240, + "L619B": 245, + "L61AC": 257, + "L61BF": 273, + "L61C6": 278, + "L61F0": 302, + "L61F7": 305, + "L626A": 352, + "L627F": 365, + "L6298": 381, + "L62A2": 387, + "L62AB": 392, + "L62CE": 413, + "L6460": 802, + "L6666": 1320, + "L6C6C": 2862, + "L707C": 3902 } } diff --git a/test/filters-cases/cc65-bin.asm.directives.labels.comments.library.approved.txt b/test/filters-cases/cc65-bin.asm.directives.labels.comments.library.approved.txt index 5045154c65f..4e2c34304f4 100644 --- a/test/filters-cases/cc65-bin.asm.directives.labels.comments.library.approved.txt +++ b/test/filters-cases/cc65-bin.asm.directives.labels.comments.library.approved.txt @@ -451,6 +451,11 @@ "source": null, "text": " .byte $4C" }, + { + "labels": [], + "source": null, + "text": "L6066: .byte $04" + }, { "labels": [], "source": null, @@ -25525,33 +25530,34 @@ "L602B": 54, "L6038": 62, "L6044": 69, - "L6068": 90, - "L608D": 107, - "L6095": 111, - "L60B7": 128, - "L60E4": 147, - "L60EC": 151, - "L610E": 168, - "L615C": 205, - "L6175": 219, - "L6178": 221, - "L6185": 228, - "L6195": 239, - "L619B": 244, - "L61AC": 256, - "L61BF": 272, - "L61C6": 277, - "L61F0": 301, - "L61F7": 304, - "L626A": 351, - "L627F": 364, - "L6298": 380, - "L62A2": 386, - "L62AB": 391, - "L62CE": 412, - "L6460": 801, - "L6666": 1319, - "L6C6C": 2861, - "L707C": 3901 + "L6066": 88, + "L6068": 91, + "L608D": 108, + "L6095": 112, + "L60B7": 129, + "L60E4": 148, + "L60EC": 152, + "L610E": 169, + "L615C": 206, + "L6175": 220, + "L6178": 222, + "L6185": 229, + "L6195": 240, + "L619B": 245, + "L61AC": 257, + "L61BF": 273, + "L61C6": 278, + "L61F0": 302, + "L61F7": 305, + "L626A": 352, + "L627F": 365, + "L6298": 381, + "L62A2": 387, + "L62AB": 392, + "L62CE": 413, + "L6460": 802, + "L6666": 1320, + "L6C6C": 2862, + "L707C": 3902 } } diff --git a/test/filters-cases/cc65-bin.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt b/test/filters-cases/cc65-bin.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt index 5045154c65f..4e2c34304f4 100644 --- a/test/filters-cases/cc65-bin.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt +++ b/test/filters-cases/cc65-bin.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt @@ -451,6 +451,11 @@ "source": null, "text": " .byte $4C" }, + { + "labels": [], + "source": null, + "text": "L6066: .byte $04" + }, { "labels": [], "source": null, @@ -25525,33 +25530,34 @@ "L602B": 54, "L6038": 62, "L6044": 69, - "L6068": 90, - "L608D": 107, - "L6095": 111, - "L60B7": 128, - "L60E4": 147, - "L60EC": 151, - "L610E": 168, - "L615C": 205, - "L6175": 219, - "L6178": 221, - "L6185": 228, - "L6195": 239, - "L619B": 244, - "L61AC": 256, - "L61BF": 272, - "L61C6": 277, - "L61F0": 301, - "L61F7": 304, - "L626A": 351, - "L627F": 364, - "L6298": 380, - "L62A2": 386, - "L62AB": 391, - "L62CE": 412, - "L6460": 801, - "L6666": 1319, - "L6C6C": 2861, - "L707C": 3901 + "L6066": 88, + "L6068": 91, + "L608D": 108, + "L6095": 112, + "L60B7": 129, + "L60E4": 148, + "L60EC": 152, + "L610E": 169, + "L615C": 206, + "L6175": 220, + "L6178": 222, + "L6185": 229, + "L6195": 240, + "L619B": 245, + "L61AC": 257, + "L61BF": 273, + "L61C6": 278, + "L61F0": 302, + "L61F7": 305, + "L626A": 352, + "L627F": 365, + "L6298": 381, + "L62A2": 387, + "L62AB": 392, + "L62CE": 413, + "L6460": 802, + "L6666": 1320, + "L6C6C": 2862, + "L707C": 3902 } } diff --git a/test/filters-cases/cc65-bin.asm.directives.library.approved.txt b/test/filters-cases/cc65-bin.asm.directives.library.approved.txt index ba192dbdd9a..d12c08449fa 100644 --- a/test/filters-cases/cc65-bin.asm.directives.library.approved.txt +++ b/test/filters-cases/cc65-bin.asm.directives.library.approved.txt @@ -25555,6 +25555,7 @@ "L602B": 59, "L6038": 67, "L6044": 74, + "L6066": 93, "L6068": 96, "L608D": 113, "L6095": 117, diff --git a/test/filters-cases/clang-hellow.asm.directives.approved.txt b/test/filters-cases/clang-hellow.asm.directives.approved.txt index 85abdd2ab7c..f1a2a75a0d7 100644 --- a/test/filters-cases/clang-hellow.asm.directives.approved.txt +++ b/test/filters-cases/clang-hellow.asm.directives.approved.txt @@ -248,16 +248,75 @@ "source": null, "text": ".Lset0 = .Lpubnames_end1-.Lpubnames_begin1 # Length of Public Names Info" }, + { + "labels": [ + { + "name": ".Lset0", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset0" + }, { "labels": [], "source": null, "text": ".Lpubnames_begin1:" }, + { + "labels": [], + "source": null, + "text": " .short 2 # DWARF Version" + }, + { + "labels": [], + "source": null, + "text": " .long .Linfo_begin1 # Offset of Compilation Unit Info" + }, { "labels": [], "source": null, "text": ".Lset1 = .Linfo_end1-.Linfo_begin1 # Compilation Unit Length" }, + { + "labels": [ + { + "name": ".Lset1", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset1" + }, + { + "labels": [], + "source": null, + "text": " .long 139 # DIE offset" + }, + { + "labels": [ + { + "name": "main", + "range": { + "endCol": 23, + "startCol": 19 + } + } + ], + "source": null, + "text": " .asciz \"main\" # External Name" + }, + { + "labels": [], + "source": null, + "text": " .long 0 # End Mark" + }, { "labels": [], "source": null, @@ -268,16 +327,57 @@ "source": null, "text": ".Lset2 = .Lpubtypes_end1-.Lpubtypes_begin1 # Length of Public Types Info" }, + { + "labels": [ + { + "name": ".Lset2", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset2" + }, { "labels": [], "source": null, "text": ".Lpubtypes_begin1:" }, + { + "labels": [], + "source": null, + "text": " .short 2 # DWARF Version" + }, + { + "labels": [], + "source": null, + "text": " .long .Linfo_begin1 # Offset of Compilation Unit Info" + }, { "labels": [], "source": null, "text": ".Lset3 = .Linfo_end1-.Linfo_begin1 # Compilation Unit Length" }, + { + "labels": [ + { + "name": ".Lset3", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset3" + }, + { + "labels": [], + "source": null, + "text": " .long 0 # End Mark" + }, { "labels": [], "source": null, @@ -286,6 +386,10 @@ ], "labelDefinitions": { ".L.str": 31, + ".Lset0": 42, + ".Lset1": 47, + ".Lset2": 53, + ".Lset3": 58, "main": 8, "str": 33 } diff --git a/test/filters-cases/clang-hellow.asm.directives.comments.approved.txt b/test/filters-cases/clang-hellow.asm.directives.comments.approved.txt index d5005d92eae..2ef11714b4d 100644 --- a/test/filters-cases/clang-hellow.asm.directives.comments.approved.txt +++ b/test/filters-cases/clang-hellow.asm.directives.comments.approved.txt @@ -243,16 +243,75 @@ "source": null, "text": ".Lset0 = .Lpubnames_end1-.Lpubnames_begin1 # Length of Public Names Info" }, + { + "labels": [ + { + "name": ".Lset0", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset0" + }, { "labels": [], "source": null, "text": ".Lpubnames_begin1:" }, + { + "labels": [], + "source": null, + "text": " .short 2 # DWARF Version" + }, + { + "labels": [], + "source": null, + "text": " .long .Linfo_begin1 # Offset of Compilation Unit Info" + }, { "labels": [], "source": null, "text": ".Lset1 = .Linfo_end1-.Linfo_begin1 # Compilation Unit Length" }, + { + "labels": [ + { + "name": ".Lset1", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset1" + }, + { + "labels": [], + "source": null, + "text": " .long 139 # DIE offset" + }, + { + "labels": [ + { + "name": "main", + "range": { + "endCol": 23, + "startCol": 19 + } + } + ], + "source": null, + "text": " .asciz \"main\" # External Name" + }, + { + "labels": [], + "source": null, + "text": " .long 0 # End Mark" + }, { "labels": [], "source": null, @@ -263,16 +322,57 @@ "source": null, "text": ".Lset2 = .Lpubtypes_end1-.Lpubtypes_begin1 # Length of Public Types Info" }, + { + "labels": [ + { + "name": ".Lset2", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset2" + }, { "labels": [], "source": null, "text": ".Lpubtypes_begin1:" }, + { + "labels": [], + "source": null, + "text": " .short 2 # DWARF Version" + }, + { + "labels": [], + "source": null, + "text": " .long .Linfo_begin1 # Offset of Compilation Unit Info" + }, { "labels": [], "source": null, "text": ".Lset3 = .Linfo_end1-.Linfo_begin1 # Compilation Unit Length" }, + { + "labels": [ + { + "name": ".Lset3", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset3" + }, + { + "labels": [], + "source": null, + "text": " .long 0 # End Mark" + }, { "labels": [], "source": null, @@ -281,6 +381,10 @@ ], "labelDefinitions": { ".L.str": 30, + ".Lset0": 41, + ".Lset1": 46, + ".Lset2": 52, + ".Lset3": 57, "main": 8, "str": 32 } diff --git a/test/filters-cases/clang-hellow.asm.directives.labels.approved.txt b/test/filters-cases/clang-hellow.asm.directives.labels.approved.txt index ce27713f9ea..80a3db93e4c 100644 --- a/test/filters-cases/clang-hellow.asm.directives.labels.approved.txt +++ b/test/filters-cases/clang-hellow.asm.directives.labels.approved.txt @@ -117,10 +117,134 @@ "labels": [], "source": null, "text": " .asciz \"moo\"" + }, + { + "labels": [], + "source": null, + "text": ".Lset0 = .Lpubnames_end1-.Lpubnames_begin1 # Length of Public Names Info" + }, + { + "labels": [ + { + "name": ".Lset0", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset0" + }, + { + "labels": [], + "source": null, + "text": " .short 2 # DWARF Version" + }, + { + "labels": [], + "source": null, + "text": " .long .Linfo_begin1 # Offset of Compilation Unit Info" + }, + { + "labels": [], + "source": null, + "text": ".Lset1 = .Linfo_end1-.Linfo_begin1 # Compilation Unit Length" + }, + { + "labels": [ + { + "name": ".Lset1", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset1" + }, + { + "labels": [], + "source": null, + "text": " .long 139 # DIE offset" + }, + { + "labels": [ + { + "name": "main", + "range": { + "endCol": 23, + "startCol": 19 + } + } + ], + "source": null, + "text": " .asciz \"main\" # External Name" + }, + { + "labels": [], + "source": null, + "text": " .long 0 # End Mark" + }, + { + "labels": [], + "source": null, + "text": ".Lset2 = .Lpubtypes_end1-.Lpubtypes_begin1 # Length of Public Types Info" + }, + { + "labels": [ + { + "name": ".Lset2", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset2" + }, + { + "labels": [], + "source": null, + "text": " .short 2 # DWARF Version" + }, + { + "labels": [], + "source": null, + "text": " .long .Linfo_begin1 # Offset of Compilation Unit Info" + }, + { + "labels": [], + "source": null, + "text": ".Lset3 = .Linfo_end1-.Linfo_begin1 # Compilation Unit Length" + }, + { + "labels": [ + { + "name": ".Lset3", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset3" + }, + { + "labels": [], + "source": null, + "text": " .long 0 # End Mark" } ], "labelDefinitions": { ".L.str": 13, + ".Lset0": 17, + ".Lset1": 21, + ".Lset2": 26, + ".Lset3": 30, "main": 1, "str": 15 } diff --git a/test/filters-cases/clang-hellow.asm.directives.labels.comments.approved.txt b/test/filters-cases/clang-hellow.asm.directives.labels.comments.approved.txt index 05a68299392..d380563f00b 100644 --- a/test/filters-cases/clang-hellow.asm.directives.labels.comments.approved.txt +++ b/test/filters-cases/clang-hellow.asm.directives.labels.comments.approved.txt @@ -112,10 +112,134 @@ "labels": [], "source": null, "text": " .asciz \"moo\"" + }, + { + "labels": [], + "source": null, + "text": ".Lset0 = .Lpubnames_end1-.Lpubnames_begin1 # Length of Public Names Info" + }, + { + "labels": [ + { + "name": ".Lset0", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset0" + }, + { + "labels": [], + "source": null, + "text": " .short 2 # DWARF Version" + }, + { + "labels": [], + "source": null, + "text": " .long .Linfo_begin1 # Offset of Compilation Unit Info" + }, + { + "labels": [], + "source": null, + "text": ".Lset1 = .Linfo_end1-.Linfo_begin1 # Compilation Unit Length" + }, + { + "labels": [ + { + "name": ".Lset1", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset1" + }, + { + "labels": [], + "source": null, + "text": " .long 139 # DIE offset" + }, + { + "labels": [ + { + "name": "main", + "range": { + "endCol": 23, + "startCol": 19 + } + } + ], + "source": null, + "text": " .asciz \"main\" # External Name" + }, + { + "labels": [], + "source": null, + "text": " .long 0 # End Mark" + }, + { + "labels": [], + "source": null, + "text": ".Lset2 = .Lpubtypes_end1-.Lpubtypes_begin1 # Length of Public Types Info" + }, + { + "labels": [ + { + "name": ".Lset2", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset2" + }, + { + "labels": [], + "source": null, + "text": " .short 2 # DWARF Version" + }, + { + "labels": [], + "source": null, + "text": " .long .Linfo_begin1 # Offset of Compilation Unit Info" + }, + { + "labels": [], + "source": null, + "text": ".Lset3 = .Linfo_end1-.Linfo_begin1 # Compilation Unit Length" + }, + { + "labels": [ + { + "name": ".Lset3", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset3" + }, + { + "labels": [], + "source": null, + "text": " .long 0 # End Mark" } ], "labelDefinitions": { ".L.str": 12, + ".Lset0": 16, + ".Lset1": 20, + ".Lset2": 25, + ".Lset3": 29, "main": 1, "str": 14 } diff --git a/test/filters-cases/clang-hellow.asm.directives.labels.comments.library.approved.txt b/test/filters-cases/clang-hellow.asm.directives.labels.comments.library.approved.txt index 05a68299392..d380563f00b 100644 --- a/test/filters-cases/clang-hellow.asm.directives.labels.comments.library.approved.txt +++ b/test/filters-cases/clang-hellow.asm.directives.labels.comments.library.approved.txt @@ -112,10 +112,134 @@ "labels": [], "source": null, "text": " .asciz \"moo\"" + }, + { + "labels": [], + "source": null, + "text": ".Lset0 = .Lpubnames_end1-.Lpubnames_begin1 # Length of Public Names Info" + }, + { + "labels": [ + { + "name": ".Lset0", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset0" + }, + { + "labels": [], + "source": null, + "text": " .short 2 # DWARF Version" + }, + { + "labels": [], + "source": null, + "text": " .long .Linfo_begin1 # Offset of Compilation Unit Info" + }, + { + "labels": [], + "source": null, + "text": ".Lset1 = .Linfo_end1-.Linfo_begin1 # Compilation Unit Length" + }, + { + "labels": [ + { + "name": ".Lset1", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset1" + }, + { + "labels": [], + "source": null, + "text": " .long 139 # DIE offset" + }, + { + "labels": [ + { + "name": "main", + "range": { + "endCol": 23, + "startCol": 19 + } + } + ], + "source": null, + "text": " .asciz \"main\" # External Name" + }, + { + "labels": [], + "source": null, + "text": " .long 0 # End Mark" + }, + { + "labels": [], + "source": null, + "text": ".Lset2 = .Lpubtypes_end1-.Lpubtypes_begin1 # Length of Public Types Info" + }, + { + "labels": [ + { + "name": ".Lset2", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset2" + }, + { + "labels": [], + "source": null, + "text": " .short 2 # DWARF Version" + }, + { + "labels": [], + "source": null, + "text": " .long .Linfo_begin1 # Offset of Compilation Unit Info" + }, + { + "labels": [], + "source": null, + "text": ".Lset3 = .Linfo_end1-.Linfo_begin1 # Compilation Unit Length" + }, + { + "labels": [ + { + "name": ".Lset3", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset3" + }, + { + "labels": [], + "source": null, + "text": " .long 0 # End Mark" } ], "labelDefinitions": { ".L.str": 12, + ".Lset0": 16, + ".Lset1": 20, + ".Lset2": 25, + ".Lset3": 29, "main": 1, "str": 14 } diff --git a/test/filters-cases/clang-hellow.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt b/test/filters-cases/clang-hellow.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt index 30687b9dc6c..2e490b57919 100644 --- a/test/filters-cases/clang-hellow.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt +++ b/test/filters-cases/clang-hellow.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt @@ -122,10 +122,134 @@ "labels": [], "source": null, "text": " .asciz \"moo\"" + }, + { + "labels": [], + "source": null, + "text": ".Lset0 = .Lpubnames_end1-.Lpubnames_begin1 # Length of Public Names Info" + }, + { + "labels": [ + { + "name": ".Lset0", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset0" + }, + { + "labels": [], + "source": null, + "text": " .short 2 # DWARF Version" + }, + { + "labels": [], + "source": null, + "text": " .long .Linfo_begin1 # Offset of Compilation Unit Info" + }, + { + "labels": [], + "source": null, + "text": ".Lset1 = .Linfo_end1-.Linfo_begin1 # Compilation Unit Length" + }, + { + "labels": [ + { + "name": ".Lset1", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset1" + }, + { + "labels": [], + "source": null, + "text": " .long 139 # DIE offset" + }, + { + "labels": [ + { + "name": "main", + "range": { + "endCol": 23, + "startCol": 19 + } + } + ], + "source": null, + "text": " .asciz \"main\" # External Name" + }, + { + "labels": [], + "source": null, + "text": " .long 0 # End Mark" + }, + { + "labels": [], + "source": null, + "text": ".Lset2 = .Lpubtypes_end1-.Lpubtypes_begin1 # Length of Public Types Info" + }, + { + "labels": [ + { + "name": ".Lset2", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset2" + }, + { + "labels": [], + "source": null, + "text": " .short 2 # DWARF Version" + }, + { + "labels": [], + "source": null, + "text": " .long .Linfo_begin1 # Offset of Compilation Unit Info" + }, + { + "labels": [], + "source": null, + "text": ".Lset3 = .Linfo_end1-.Linfo_begin1 # Compilation Unit Length" + }, + { + "labels": [ + { + "name": ".Lset3", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset3" + }, + { + "labels": [], + "source": null, + "text": " .long 0 # End Mark" } ], "labelDefinitions": { ".L.str": 12, + ".Lset0": 16, + ".Lset1": 20, + ".Lset2": 25, + ".Lset3": 29, "main": 1, "str": 14 } diff --git a/test/filters-cases/clang-hellow.asm.directives.library.approved.txt b/test/filters-cases/clang-hellow.asm.directives.library.approved.txt index 85abdd2ab7c..f1a2a75a0d7 100644 --- a/test/filters-cases/clang-hellow.asm.directives.library.approved.txt +++ b/test/filters-cases/clang-hellow.asm.directives.library.approved.txt @@ -248,16 +248,75 @@ "source": null, "text": ".Lset0 = .Lpubnames_end1-.Lpubnames_begin1 # Length of Public Names Info" }, + { + "labels": [ + { + "name": ".Lset0", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset0" + }, { "labels": [], "source": null, "text": ".Lpubnames_begin1:" }, + { + "labels": [], + "source": null, + "text": " .short 2 # DWARF Version" + }, + { + "labels": [], + "source": null, + "text": " .long .Linfo_begin1 # Offset of Compilation Unit Info" + }, { "labels": [], "source": null, "text": ".Lset1 = .Linfo_end1-.Linfo_begin1 # Compilation Unit Length" }, + { + "labels": [ + { + "name": ".Lset1", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset1" + }, + { + "labels": [], + "source": null, + "text": " .long 139 # DIE offset" + }, + { + "labels": [ + { + "name": "main", + "range": { + "endCol": 23, + "startCol": 19 + } + } + ], + "source": null, + "text": " .asciz \"main\" # External Name" + }, + { + "labels": [], + "source": null, + "text": " .long 0 # End Mark" + }, { "labels": [], "source": null, @@ -268,16 +327,57 @@ "source": null, "text": ".Lset2 = .Lpubtypes_end1-.Lpubtypes_begin1 # Length of Public Types Info" }, + { + "labels": [ + { + "name": ".Lset2", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset2" + }, { "labels": [], "source": null, "text": ".Lpubtypes_begin1:" }, + { + "labels": [], + "source": null, + "text": " .short 2 # DWARF Version" + }, + { + "labels": [], + "source": null, + "text": " .long .Linfo_begin1 # Offset of Compilation Unit Info" + }, { "labels": [], "source": null, "text": ".Lset3 = .Linfo_end1-.Linfo_begin1 # Compilation Unit Length" }, + { + "labels": [ + { + "name": ".Lset3", + "range": { + "endCol": 23, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long .Lset3" + }, + { + "labels": [], + "source": null, + "text": " .long 0 # End Mark" + }, { "labels": [], "source": null, @@ -286,6 +386,10 @@ ], "labelDefinitions": { ".L.str": 31, + ".Lset0": 42, + ".Lset1": 47, + ".Lset2": 53, + ".Lset3": 58, "main": 8, "str": 33 } diff --git a/test/filters-cases/clang-on-mac.asm.directives.approved.txt b/test/filters-cases/clang-on-mac.asm.directives.approved.txt index a781a61d868..b84cb8fc4e9 100644 --- a/test/filters-cases/clang-on-mac.asm.directives.approved.txt +++ b/test/filters-cases/clang-on-mac.asm.directives.approved.txt @@ -122,11 +122,152 @@ "source": null, "text": "Lset0 = Lsection_abbrev-Lsection_abbrev ## Offset Into Abbrev. Section" }, + { + "labels": [ + { + "name": "Lset0", + "range": { + "endCol": 22, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long Lset0" + }, + { + "labels": [], + "source": null, + "text": " .byte 8 ## Address Size (in bytes)" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## Abbrev [1] 0xb:0x49 DW_TAG_compile_unit" + }, + { + "labels": [], + "source": null, + "text": " .long 0 ## DW_AT_producer" + }, + { + "labels": [], + "source": null, + "text": " .short 4 ## DW_AT_language" + }, + { + "labels": [], + "source": null, + "text": " .long 45 ## DW_AT_name" + }, { "labels": [], "source": null, "text": "Lset1 = Lline_table_start0-Lsection_line ## DW_AT_stmt_list" }, + { + "labels": [ + { + "name": "Lset1", + "range": { + "endCol": 22, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long Lset1" + }, + { + "labels": [], + "source": null, + "text": " .long 54 ## DW_AT_comp_dir" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_begin0 ## DW_AT_low_pc" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_end0 ## DW_AT_high_pc" + }, + { + "labels": [], + "source": null, + "text": " .byte 2 ## Abbrev [2] 0x2e:0x1e DW_TAG_subprogram" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_begin0 ## DW_AT_low_pc" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_end0 ## DW_AT_high_pc" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_frame_base" + }, + { + "labels": [], + "source": null, + "text": " .byte 86" + }, + { + "labels": [], + "source": null, + "text": " .long 85 ## DW_AT_name" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_decl_file" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_decl_line" + }, + { + "labels": [], + "source": null, + "text": " .long 76 ## DW_AT_type" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_external" + }, + { + "labels": [], + "source": null, + "text": " .byte 3 ## Abbrev [3] 0x4c:0x7 DW_TAG_base_type" + }, + { + "labels": [], + "source": null, + "text": " .long 90 ## DW_AT_name" + }, + { + "labels": [], + "source": null, + "text": " .byte 5 ## DW_AT_encoding" + }, + { + "labels": [], + "source": null, + "text": " .byte 4 ## DW_AT_byte_size" + }, + { + "labels": [], + "source": null, + "text": " .byte 0 ## End Of Children Mark" + }, { "labels": [], "source": null, @@ -189,6 +330,8 @@ } ], "labelDefinitions": { + "Lset0": 21, + "Lset1": 28, "_main": 1 } } diff --git a/test/filters-cases/clang-on-mac.asm.directives.comments.approved.txt b/test/filters-cases/clang-on-mac.asm.directives.comments.approved.txt index 03de39fafe8..a21c312aa9c 100644 --- a/test/filters-cases/clang-on-mac.asm.directives.comments.approved.txt +++ b/test/filters-cases/clang-on-mac.asm.directives.comments.approved.txt @@ -117,11 +117,152 @@ "source": null, "text": "Lset0 = Lsection_abbrev-Lsection_abbrev ## Offset Into Abbrev. Section" }, + { + "labels": [ + { + "name": "Lset0", + "range": { + "endCol": 22, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long Lset0" + }, + { + "labels": [], + "source": null, + "text": " .byte 8 ## Address Size (in bytes)" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## Abbrev [1] 0xb:0x49 DW_TAG_compile_unit" + }, + { + "labels": [], + "source": null, + "text": " .long 0 ## DW_AT_producer" + }, + { + "labels": [], + "source": null, + "text": " .short 4 ## DW_AT_language" + }, + { + "labels": [], + "source": null, + "text": " .long 45 ## DW_AT_name" + }, { "labels": [], "source": null, "text": "Lset1 = Lline_table_start0-Lsection_line ## DW_AT_stmt_list" }, + { + "labels": [ + { + "name": "Lset1", + "range": { + "endCol": 22, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long Lset1" + }, + { + "labels": [], + "source": null, + "text": " .long 54 ## DW_AT_comp_dir" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_begin0 ## DW_AT_low_pc" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_end0 ## DW_AT_high_pc" + }, + { + "labels": [], + "source": null, + "text": " .byte 2 ## Abbrev [2] 0x2e:0x1e DW_TAG_subprogram" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_begin0 ## DW_AT_low_pc" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_end0 ## DW_AT_high_pc" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_frame_base" + }, + { + "labels": [], + "source": null, + "text": " .byte 86" + }, + { + "labels": [], + "source": null, + "text": " .long 85 ## DW_AT_name" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_decl_file" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_decl_line" + }, + { + "labels": [], + "source": null, + "text": " .long 76 ## DW_AT_type" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_external" + }, + { + "labels": [], + "source": null, + "text": " .byte 3 ## Abbrev [3] 0x4c:0x7 DW_TAG_base_type" + }, + { + "labels": [], + "source": null, + "text": " .long 90 ## DW_AT_name" + }, + { + "labels": [], + "source": null, + "text": " .byte 5 ## DW_AT_encoding" + }, + { + "labels": [], + "source": null, + "text": " .byte 4 ## DW_AT_byte_size" + }, + { + "labels": [], + "source": null, + "text": " .byte 0 ## End Of Children Mark" + }, { "labels": [], "source": null, @@ -184,6 +325,8 @@ } ], "labelDefinitions": { + "Lset0": 20, + "Lset1": 27, "_main": 1 } } diff --git a/test/filters-cases/clang-on-mac.asm.directives.labels.approved.txt b/test/filters-cases/clang-on-mac.asm.directives.labels.approved.txt index 056ecbf6ebc..117ec4118cb 100644 --- a/test/filters-cases/clang-on-mac.asm.directives.labels.approved.txt +++ b/test/filters-cases/clang-on-mac.asm.directives.labels.approved.txt @@ -52,6 +52,162 @@ }, "text": " retq" }, + { + "labels": [], + "source": null, + "text": "" + }, + { + "labels": [], + "source": null, + "text": "Lset0 = Lsection_abbrev-Lsection_abbrev ## Offset Into Abbrev. Section" + }, + { + "labels": [ + { + "name": "Lset0", + "range": { + "endCol": 22, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long Lset0" + }, + { + "labels": [], + "source": null, + "text": " .byte 8 ## Address Size (in bytes)" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## Abbrev [1] 0xb:0x49 DW_TAG_compile_unit" + }, + { + "labels": [], + "source": null, + "text": " .long 0 ## DW_AT_producer" + }, + { + "labels": [], + "source": null, + "text": " .short 4 ## DW_AT_language" + }, + { + "labels": [], + "source": null, + "text": " .long 45 ## DW_AT_name" + }, + { + "labels": [], + "source": null, + "text": "Lset1 = Lline_table_start0-Lsection_line ## DW_AT_stmt_list" + }, + { + "labels": [ + { + "name": "Lset1", + "range": { + "endCol": 22, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long Lset1" + }, + { + "labels": [], + "source": null, + "text": " .long 54 ## DW_AT_comp_dir" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_begin0 ## DW_AT_low_pc" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_end0 ## DW_AT_high_pc" + }, + { + "labels": [], + "source": null, + "text": " .byte 2 ## Abbrev [2] 0x2e:0x1e DW_TAG_subprogram" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_begin0 ## DW_AT_low_pc" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_end0 ## DW_AT_high_pc" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_frame_base" + }, + { + "labels": [], + "source": null, + "text": " .byte 86" + }, + { + "labels": [], + "source": null, + "text": " .long 85 ## DW_AT_name" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_decl_file" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_decl_line" + }, + { + "labels": [], + "source": null, + "text": " .long 76 ## DW_AT_type" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_external" + }, + { + "labels": [], + "source": null, + "text": " .byte 3 ## Abbrev [3] 0x4c:0x7 DW_TAG_base_type" + }, + { + "labels": [], + "source": null, + "text": " .long 90 ## DW_AT_name" + }, + { + "labels": [], + "source": null, + "text": " .byte 5 ## DW_AT_encoding" + }, + { + "labels": [], + "source": null, + "text": " .byte 4 ## DW_AT_byte_size" + }, + { + "labels": [], + "source": null, + "text": " .byte 0 ## End Of Children Mark" + }, { "labels": [], "source": null, @@ -59,6 +215,8 @@ } ], "labelDefinitions": { + "Lset0": 9, + "Lset1": 16, "_main": 1 } } diff --git a/test/filters-cases/clang-on-mac.asm.directives.labels.comments.approved.txt b/test/filters-cases/clang-on-mac.asm.directives.labels.comments.approved.txt index 93c18d5c498..f1234d5e0c7 100644 --- a/test/filters-cases/clang-on-mac.asm.directives.labels.comments.approved.txt +++ b/test/filters-cases/clang-on-mac.asm.directives.labels.comments.approved.txt @@ -47,6 +47,162 @@ }, "text": " retq" }, + { + "labels": [], + "source": null, + "text": "" + }, + { + "labels": [], + "source": null, + "text": "Lset0 = Lsection_abbrev-Lsection_abbrev ## Offset Into Abbrev. Section" + }, + { + "labels": [ + { + "name": "Lset0", + "range": { + "endCol": 22, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long Lset0" + }, + { + "labels": [], + "source": null, + "text": " .byte 8 ## Address Size (in bytes)" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## Abbrev [1] 0xb:0x49 DW_TAG_compile_unit" + }, + { + "labels": [], + "source": null, + "text": " .long 0 ## DW_AT_producer" + }, + { + "labels": [], + "source": null, + "text": " .short 4 ## DW_AT_language" + }, + { + "labels": [], + "source": null, + "text": " .long 45 ## DW_AT_name" + }, + { + "labels": [], + "source": null, + "text": "Lset1 = Lline_table_start0-Lsection_line ## DW_AT_stmt_list" + }, + { + "labels": [ + { + "name": "Lset1", + "range": { + "endCol": 22, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long Lset1" + }, + { + "labels": [], + "source": null, + "text": " .long 54 ## DW_AT_comp_dir" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_begin0 ## DW_AT_low_pc" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_end0 ## DW_AT_high_pc" + }, + { + "labels": [], + "source": null, + "text": " .byte 2 ## Abbrev [2] 0x2e:0x1e DW_TAG_subprogram" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_begin0 ## DW_AT_low_pc" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_end0 ## DW_AT_high_pc" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_frame_base" + }, + { + "labels": [], + "source": null, + "text": " .byte 86" + }, + { + "labels": [], + "source": null, + "text": " .long 85 ## DW_AT_name" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_decl_file" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_decl_line" + }, + { + "labels": [], + "source": null, + "text": " .long 76 ## DW_AT_type" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_external" + }, + { + "labels": [], + "source": null, + "text": " .byte 3 ## Abbrev [3] 0x4c:0x7 DW_TAG_base_type" + }, + { + "labels": [], + "source": null, + "text": " .long 90 ## DW_AT_name" + }, + { + "labels": [], + "source": null, + "text": " .byte 5 ## DW_AT_encoding" + }, + { + "labels": [], + "source": null, + "text": " .byte 4 ## DW_AT_byte_size" + }, + { + "labels": [], + "source": null, + "text": " .byte 0 ## End Of Children Mark" + }, { "labels": [], "source": null, @@ -54,6 +210,8 @@ } ], "labelDefinitions": { + "Lset0": 8, + "Lset1": 15, "_main": 1 } } diff --git a/test/filters-cases/clang-on-mac.asm.directives.labels.comments.library.approved.txt b/test/filters-cases/clang-on-mac.asm.directives.labels.comments.library.approved.txt index 93c18d5c498..f1234d5e0c7 100644 --- a/test/filters-cases/clang-on-mac.asm.directives.labels.comments.library.approved.txt +++ b/test/filters-cases/clang-on-mac.asm.directives.labels.comments.library.approved.txt @@ -47,6 +47,162 @@ }, "text": " retq" }, + { + "labels": [], + "source": null, + "text": "" + }, + { + "labels": [], + "source": null, + "text": "Lset0 = Lsection_abbrev-Lsection_abbrev ## Offset Into Abbrev. Section" + }, + { + "labels": [ + { + "name": "Lset0", + "range": { + "endCol": 22, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long Lset0" + }, + { + "labels": [], + "source": null, + "text": " .byte 8 ## Address Size (in bytes)" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## Abbrev [1] 0xb:0x49 DW_TAG_compile_unit" + }, + { + "labels": [], + "source": null, + "text": " .long 0 ## DW_AT_producer" + }, + { + "labels": [], + "source": null, + "text": " .short 4 ## DW_AT_language" + }, + { + "labels": [], + "source": null, + "text": " .long 45 ## DW_AT_name" + }, + { + "labels": [], + "source": null, + "text": "Lset1 = Lline_table_start0-Lsection_line ## DW_AT_stmt_list" + }, + { + "labels": [ + { + "name": "Lset1", + "range": { + "endCol": 22, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long Lset1" + }, + { + "labels": [], + "source": null, + "text": " .long 54 ## DW_AT_comp_dir" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_begin0 ## DW_AT_low_pc" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_end0 ## DW_AT_high_pc" + }, + { + "labels": [], + "source": null, + "text": " .byte 2 ## Abbrev [2] 0x2e:0x1e DW_TAG_subprogram" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_begin0 ## DW_AT_low_pc" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_end0 ## DW_AT_high_pc" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_frame_base" + }, + { + "labels": [], + "source": null, + "text": " .byte 86" + }, + { + "labels": [], + "source": null, + "text": " .long 85 ## DW_AT_name" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_decl_file" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_decl_line" + }, + { + "labels": [], + "source": null, + "text": " .long 76 ## DW_AT_type" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_external" + }, + { + "labels": [], + "source": null, + "text": " .byte 3 ## Abbrev [3] 0x4c:0x7 DW_TAG_base_type" + }, + { + "labels": [], + "source": null, + "text": " .long 90 ## DW_AT_name" + }, + { + "labels": [], + "source": null, + "text": " .byte 5 ## DW_AT_encoding" + }, + { + "labels": [], + "source": null, + "text": " .byte 4 ## DW_AT_byte_size" + }, + { + "labels": [], + "source": null, + "text": " .byte 0 ## End Of Children Mark" + }, { "labels": [], "source": null, @@ -54,6 +210,8 @@ } ], "labelDefinitions": { + "Lset0": 8, + "Lset1": 15, "_main": 1 } } diff --git a/test/filters-cases/clang-on-mac.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt b/test/filters-cases/clang-on-mac.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt index 173702049ff..40540b154a5 100644 --- a/test/filters-cases/clang-on-mac.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt +++ b/test/filters-cases/clang-on-mac.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt @@ -52,6 +52,162 @@ }, "text": " retq" }, + { + "labels": [], + "source": null, + "text": "" + }, + { + "labels": [], + "source": null, + "text": "Lset0 = Lsection_abbrev-Lsection_abbrev ## Offset Into Abbrev. Section" + }, + { + "labels": [ + { + "name": "Lset0", + "range": { + "endCol": 22, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long Lset0" + }, + { + "labels": [], + "source": null, + "text": " .byte 8 ## Address Size (in bytes)" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## Abbrev [1] 0xb:0x49 DW_TAG_compile_unit" + }, + { + "labels": [], + "source": null, + "text": " .long 0 ## DW_AT_producer" + }, + { + "labels": [], + "source": null, + "text": " .short 4 ## DW_AT_language" + }, + { + "labels": [], + "source": null, + "text": " .long 45 ## DW_AT_name" + }, + { + "labels": [], + "source": null, + "text": "Lset1 = Lline_table_start0-Lsection_line ## DW_AT_stmt_list" + }, + { + "labels": [ + { + "name": "Lset1", + "range": { + "endCol": 22, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long Lset1" + }, + { + "labels": [], + "source": null, + "text": " .long 54 ## DW_AT_comp_dir" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_begin0 ## DW_AT_low_pc" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_end0 ## DW_AT_high_pc" + }, + { + "labels": [], + "source": null, + "text": " .byte 2 ## Abbrev [2] 0x2e:0x1e DW_TAG_subprogram" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_begin0 ## DW_AT_low_pc" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_end0 ## DW_AT_high_pc" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_frame_base" + }, + { + "labels": [], + "source": null, + "text": " .byte 86" + }, + { + "labels": [], + "source": null, + "text": " .long 85 ## DW_AT_name" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_decl_file" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_decl_line" + }, + { + "labels": [], + "source": null, + "text": " .long 76 ## DW_AT_type" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_external" + }, + { + "labels": [], + "source": null, + "text": " .byte 3 ## Abbrev [3] 0x4c:0x7 DW_TAG_base_type" + }, + { + "labels": [], + "source": null, + "text": " .long 90 ## DW_AT_name" + }, + { + "labels": [], + "source": null, + "text": " .byte 5 ## DW_AT_encoding" + }, + { + "labels": [], + "source": null, + "text": " .byte 4 ## DW_AT_byte_size" + }, + { + "labels": [], + "source": null, + "text": " .byte 0 ## End Of Children Mark" + }, { "labels": [], "source": null, @@ -59,6 +215,8 @@ } ], "labelDefinitions": { + "Lset0": 8, + "Lset1": 15, "_main": 1 } } diff --git a/test/filters-cases/clang-on-mac.asm.directives.library.approved.txt b/test/filters-cases/clang-on-mac.asm.directives.library.approved.txt index a781a61d868..b84cb8fc4e9 100644 --- a/test/filters-cases/clang-on-mac.asm.directives.library.approved.txt +++ b/test/filters-cases/clang-on-mac.asm.directives.library.approved.txt @@ -122,11 +122,152 @@ "source": null, "text": "Lset0 = Lsection_abbrev-Lsection_abbrev ## Offset Into Abbrev. Section" }, + { + "labels": [ + { + "name": "Lset0", + "range": { + "endCol": 22, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long Lset0" + }, + { + "labels": [], + "source": null, + "text": " .byte 8 ## Address Size (in bytes)" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## Abbrev [1] 0xb:0x49 DW_TAG_compile_unit" + }, + { + "labels": [], + "source": null, + "text": " .long 0 ## DW_AT_producer" + }, + { + "labels": [], + "source": null, + "text": " .short 4 ## DW_AT_language" + }, + { + "labels": [], + "source": null, + "text": " .long 45 ## DW_AT_name" + }, { "labels": [], "source": null, "text": "Lset1 = Lline_table_start0-Lsection_line ## DW_AT_stmt_list" }, + { + "labels": [ + { + "name": "Lset1", + "range": { + "endCol": 22, + "startCol": 17 + } + } + ], + "source": null, + "text": " .long Lset1" + }, + { + "labels": [], + "source": null, + "text": " .long 54 ## DW_AT_comp_dir" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_begin0 ## DW_AT_low_pc" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_end0 ## DW_AT_high_pc" + }, + { + "labels": [], + "source": null, + "text": " .byte 2 ## Abbrev [2] 0x2e:0x1e DW_TAG_subprogram" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_begin0 ## DW_AT_low_pc" + }, + { + "labels": [], + "source": null, + "text": " .quad Lfunc_end0 ## DW_AT_high_pc" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_frame_base" + }, + { + "labels": [], + "source": null, + "text": " .byte 86" + }, + { + "labels": [], + "source": null, + "text": " .long 85 ## DW_AT_name" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_decl_file" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_decl_line" + }, + { + "labels": [], + "source": null, + "text": " .long 76 ## DW_AT_type" + }, + { + "labels": [], + "source": null, + "text": " .byte 1 ## DW_AT_external" + }, + { + "labels": [], + "source": null, + "text": " .byte 3 ## Abbrev [3] 0x4c:0x7 DW_TAG_base_type" + }, + { + "labels": [], + "source": null, + "text": " .long 90 ## DW_AT_name" + }, + { + "labels": [], + "source": null, + "text": " .byte 5 ## DW_AT_encoding" + }, + { + "labels": [], + "source": null, + "text": " .byte 4 ## DW_AT_byte_size" + }, + { + "labels": [], + "source": null, + "text": " .byte 0 ## End Of Children Mark" + }, { "labels": [], "source": null, @@ -189,6 +330,8 @@ } ], "labelDefinitions": { + "Lset0": 21, + "Lset1": 28, "_main": 1 } } diff --git a/test/filters-cases/diab.asm.directives.approved.txt b/test/filters-cases/diab.asm.directives.approved.txt index e2893db93bb..7b6fb346c78 100644 --- a/test/filters-cases/diab.asm.directives.approved.txt +++ b/test/filters-cases/diab.asm.directives.approved.txt @@ -3645,6 +3645,7 @@ ".L64": 350, ".L65": 424, ".L66": 332, + ".L86": 460, "main": 371 } } diff --git a/test/filters-cases/diab.asm.directives.comments.approved.txt b/test/filters-cases/diab.asm.directives.comments.approved.txt index e2a4138f188..fb48497d3e5 100644 --- a/test/filters-cases/diab.asm.directives.comments.approved.txt +++ b/test/filters-cases/diab.asm.directives.comments.approved.txt @@ -3215,6 +3215,7 @@ ".L64": 289, ".L65": 339, ".L66": 271, + ".L86": 374, "main": 300 } } diff --git a/test/filters-cases/diab.asm.directives.labels.approved.txt b/test/filters-cases/diab.asm.directives.labels.approved.txt index 5b644013017..2be6e32e9ed 100644 --- a/test/filters-cases/diab.asm.directives.labels.approved.txt +++ b/test/filters-cases/diab.asm.directives.labels.approved.txt @@ -3012,6 +3012,11 @@ "source": null, "text": "#$$ld" }, + { + "labels": [], + "source": null, + "text": ".L86: .d2filenum \"/tmp/compiler-explorer-compiler202107-8023-z5iran.8cqm/example.cpp\"" + }, { "labels": [], "source": null, @@ -3045,6 +3050,7 @@ ".L64": 296, ".L65": 364, ".L66": 284, + ".L86": 394, "main": 313 } } diff --git a/test/filters-cases/diab.asm.directives.labels.comments.approved.txt b/test/filters-cases/diab.asm.directives.labels.comments.approved.txt index f7421a31b35..5914449081c 100644 --- a/test/filters-cases/diab.asm.directives.labels.comments.approved.txt +++ b/test/filters-cases/diab.asm.directives.labels.comments.approved.txt @@ -2547,6 +2547,11 @@ "source": null, "text": " .byte 0" }, + { + "labels": [], + "source": null, + "text": ".L86: .d2filenum \"/tmp/compiler-explorer-compiler202107-8023-z5iran.8cqm/example.cpp\"" + }, { "labels": [], "source": null, @@ -2580,6 +2585,7 @@ ".L64": 229, ".L65": 272, ".L66": 217, + ".L86": 301, "main": 235 } } diff --git a/test/filters-cases/diab.asm.directives.labels.comments.library.approved.txt b/test/filters-cases/diab.asm.directives.labels.comments.library.approved.txt index f7421a31b35..5914449081c 100644 --- a/test/filters-cases/diab.asm.directives.labels.comments.library.approved.txt +++ b/test/filters-cases/diab.asm.directives.labels.comments.library.approved.txt @@ -2547,6 +2547,11 @@ "source": null, "text": " .byte 0" }, + { + "labels": [], + "source": null, + "text": ".L86: .d2filenum \"/tmp/compiler-explorer-compiler202107-8023-z5iran.8cqm/example.cpp\"" + }, { "labels": [], "source": null, @@ -2580,6 +2585,7 @@ ".L64": 229, ".L65": 272, ".L66": 217, + ".L86": 301, "main": 235 } } diff --git a/test/filters-cases/diab.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt b/test/filters-cases/diab.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt index f7421a31b35..5914449081c 100644 --- a/test/filters-cases/diab.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt +++ b/test/filters-cases/diab.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt @@ -2547,6 +2547,11 @@ "source": null, "text": " .byte 0" }, + { + "labels": [], + "source": null, + "text": ".L86: .d2filenum \"/tmp/compiler-explorer-compiler202107-8023-z5iran.8cqm/example.cpp\"" + }, { "labels": [], "source": null, @@ -2580,6 +2585,7 @@ ".L64": 229, ".L65": 272, ".L66": 217, + ".L86": 301, "main": 235 } } diff --git a/test/filters-cases/diab.asm.directives.library.approved.txt b/test/filters-cases/diab.asm.directives.library.approved.txt index e2893db93bb..7b6fb346c78 100644 --- a/test/filters-cases/diab.asm.directives.library.approved.txt +++ b/test/filters-cases/diab.asm.directives.library.approved.txt @@ -3645,6 +3645,7 @@ ".L64": 350, ".L65": 424, ".L66": 332, + ".L86": 460, "main": 371 } } diff --git a/test/filters-cases/gcc-avr-sum.asm.directives.approved.txt b/test/filters-cases/gcc-avr-sum.asm.directives.approved.txt index fdecfbe6485..b2967537e02 100644 --- a/test/filters-cases/gcc-avr-sum.asm.directives.approved.txt +++ b/test/filters-cases/gcc-avr-sum.asm.directives.approved.txt @@ -836,7 +836,9 @@ ".L2": 64, ".L3": 75, ".L4": 38, + ".L__stack_usage": 24, "_Z12testFunctionPii": 8, + "__CCP__": 4, "__SP_H__": 2, "__SP_L__": 3, "__SREG__": 1, diff --git a/test/filters-cases/gcc-avr-sum.asm.directives.comments.approved.txt b/test/filters-cases/gcc-avr-sum.asm.directives.comments.approved.txt index 65ab985a2ed..9639fef7ff0 100644 --- a/test/filters-cases/gcc-avr-sum.asm.directives.comments.approved.txt +++ b/test/filters-cases/gcc-avr-sum.asm.directives.comments.approved.txt @@ -816,7 +816,9 @@ ".L2": 61, ".L3": 72, ".L4": 35, + ".L__stack_usage": 21, "_Z12testFunctionPii": 8, + "__CCP__": 4, "__SP_H__": 2, "__SP_L__": 3, "__SREG__": 1, diff --git a/test/filters-cases/gcc-avr-sum.asm.directives.labels.approved.txt b/test/filters-cases/gcc-avr-sum.asm.directives.labels.approved.txt index 2dd096e9d8c..b6d3dbde6ed 100644 --- a/test/filters-cases/gcc-avr-sum.asm.directives.labels.approved.txt +++ b/test/filters-cases/gcc-avr-sum.asm.directives.labels.approved.txt @@ -15,6 +15,11 @@ "source": null, "text": "__SP_L__ = 0x3d" }, + { + "labels": [], + "source": null, + "text": "__CCP__ = 0x34" + }, { "labels": [], "source": null, @@ -187,6 +192,11 @@ "source": null, "text": "/* stack size = 10 */" }, + { + "labels": [], + "source": null, + "text": ".L__stack_usage = 10" + }, { "labels": [], "source": { @@ -743,14 +753,16 @@ } ], "labelDefinitions": { - ".L2": 53, - ".L3": 63, - ".L4": 29, - "_Z12testFunctionPii": 6, + ".L2": 55, + ".L3": 65, + ".L4": 31, + ".L__stack_usage": 21, + "_Z12testFunctionPii": 7, + "__CCP__": 4, "__SP_H__": 2, "__SP_L__": 3, "__SREG__": 1, - "__tmp_reg__": 4, - "__zero_reg__": 5 + "__tmp_reg__": 5, + "__zero_reg__": 6 } } diff --git a/test/filters-cases/gcc-avr-sum.asm.directives.labels.comments.approved.txt b/test/filters-cases/gcc-avr-sum.asm.directives.labels.comments.approved.txt index c8a7404d2a7..65067939045 100644 --- a/test/filters-cases/gcc-avr-sum.asm.directives.labels.comments.approved.txt +++ b/test/filters-cases/gcc-avr-sum.asm.directives.labels.comments.approved.txt @@ -15,6 +15,11 @@ "source": null, "text": "__SP_L__ = 0x3d" }, + { + "labels": [], + "source": null, + "text": "__CCP__ = 0x34" + }, { "labels": [], "source": null, @@ -172,6 +177,11 @@ }, "text": " out __SP_L__,r28" }, + { + "labels": [], + "source": null, + "text": ".L__stack_usage = 10" + }, { "labels": [], "source": { @@ -723,14 +733,16 @@ } ], "labelDefinitions": { - ".L2": 50, - ".L3": 60, - ".L4": 26, - "_Z12testFunctionPii": 6, + ".L2": 52, + ".L3": 62, + ".L4": 28, + ".L__stack_usage": 18, + "_Z12testFunctionPii": 7, + "__CCP__": 4, "__SP_H__": 2, "__SP_L__": 3, "__SREG__": 1, - "__tmp_reg__": 4, - "__zero_reg__": 5 + "__tmp_reg__": 5, + "__zero_reg__": 6 } } diff --git a/test/filters-cases/gcc-avr-sum.asm.directives.labels.comments.library.approved.txt b/test/filters-cases/gcc-avr-sum.asm.directives.labels.comments.library.approved.txt index c8a7404d2a7..65067939045 100644 --- a/test/filters-cases/gcc-avr-sum.asm.directives.labels.comments.library.approved.txt +++ b/test/filters-cases/gcc-avr-sum.asm.directives.labels.comments.library.approved.txt @@ -15,6 +15,11 @@ "source": null, "text": "__SP_L__ = 0x3d" }, + { + "labels": [], + "source": null, + "text": "__CCP__ = 0x34" + }, { "labels": [], "source": null, @@ -172,6 +177,11 @@ }, "text": " out __SP_L__,r28" }, + { + "labels": [], + "source": null, + "text": ".L__stack_usage = 10" + }, { "labels": [], "source": { @@ -723,14 +733,16 @@ } ], "labelDefinitions": { - ".L2": 50, - ".L3": 60, - ".L4": 26, - "_Z12testFunctionPii": 6, + ".L2": 52, + ".L3": 62, + ".L4": 28, + ".L__stack_usage": 18, + "_Z12testFunctionPii": 7, + "__CCP__": 4, "__SP_H__": 2, "__SP_L__": 3, "__SREG__": 1, - "__tmp_reg__": 4, - "__zero_reg__": 5 + "__tmp_reg__": 5, + "__zero_reg__": 6 } } diff --git a/test/filters-cases/gcc-avr-sum.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt b/test/filters-cases/gcc-avr-sum.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt index c8a7404d2a7..65067939045 100644 --- a/test/filters-cases/gcc-avr-sum.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt +++ b/test/filters-cases/gcc-avr-sum.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt @@ -15,6 +15,11 @@ "source": null, "text": "__SP_L__ = 0x3d" }, + { + "labels": [], + "source": null, + "text": "__CCP__ = 0x34" + }, { "labels": [], "source": null, @@ -172,6 +177,11 @@ }, "text": " out __SP_L__,r28" }, + { + "labels": [], + "source": null, + "text": ".L__stack_usage = 10" + }, { "labels": [], "source": { @@ -723,14 +733,16 @@ } ], "labelDefinitions": { - ".L2": 50, - ".L3": 60, - ".L4": 26, - "_Z12testFunctionPii": 6, + ".L2": 52, + ".L3": 62, + ".L4": 28, + ".L__stack_usage": 18, + "_Z12testFunctionPii": 7, + "__CCP__": 4, "__SP_H__": 2, "__SP_L__": 3, "__SREG__": 1, - "__tmp_reg__": 4, - "__zero_reg__": 5 + "__tmp_reg__": 5, + "__zero_reg__": 6 } } diff --git a/test/filters-cases/gcc-avr-sum.asm.directives.library.approved.txt b/test/filters-cases/gcc-avr-sum.asm.directives.library.approved.txt index fdecfbe6485..b2967537e02 100644 --- a/test/filters-cases/gcc-avr-sum.asm.directives.library.approved.txt +++ b/test/filters-cases/gcc-avr-sum.asm.directives.library.approved.txt @@ -836,7 +836,9 @@ ".L2": 64, ".L3": 75, ".L4": 38, + ".L__stack_usage": 24, "_Z12testFunctionPii": 8, + "__CCP__": 4, "__SP_H__": 2, "__SP_L__": 3, "__SREG__": 1, diff --git a/test/filters-cases/gcc-avr-sum.asm.none.approved.txt b/test/filters-cases/gcc-avr-sum.asm.none.approved.txt index d4bf85e0e70..ef8bc6f7fd2 100644 --- a/test/filters-cases/gcc-avr-sum.asm.none.approved.txt +++ b/test/filters-cases/gcc-avr-sum.asm.none.approved.txt @@ -1394,6 +1394,7 @@ ".LM5": 109, ".LM6": 124, ".LM7": 130, + ".L__stack_usage": 63, ".Letext0": 151, ".Lscope1": 147, ".Ltext0": 11, diff --git a/test/filters-cases/icc.hellow.asm.directives.approved.txt b/test/filters-cases/icc.hellow.asm.directives.approved.txt index 654ec0d1318..6a5dd564a72 100644 --- a/test/filters-cases/icc.hellow.asm.directives.approved.txt +++ b/test/filters-cases/icc.hellow.asm.directives.approved.txt @@ -699,6 +699,21 @@ } ], "labelDefinitions": { + "..B1.1": 7, + "..B1.2": 44, + "..B1.3": 55, + "..B1.6": 27, + "..___tag_value_main.10": 38, + "..___tag_value_main.11": 41, + "..___tag_value_main.12": 49, + "..___tag_value_main.13": 52, + "..___tag_value_main.15": 62, + "..___tag_value_main.19": 65, + "..___tag_value_main.2": 8, + "..___tag_value_main.4": 11, + "..___tag_value_main.5": 14, + "..___tag_value_main.8": 21, + "..___tag_value_main.9": 24, ".L_2__STRING.0": 73, ".L_2__STRING.1": 86, "main": 6 diff --git a/test/filters-cases/icc.hellow.asm.directives.comments.approved.txt b/test/filters-cases/icc.hellow.asm.directives.comments.approved.txt index 4802fa53378..9c50d1f16fb 100644 --- a/test/filters-cases/icc.hellow.asm.directives.comments.approved.txt +++ b/test/filters-cases/icc.hellow.asm.directives.comments.approved.txt @@ -499,6 +499,21 @@ } ], "labelDefinitions": { + "..B1.1": 4, + "..B1.2": 39, + "..B1.3": 49, + "..B1.6": 23, + "..___tag_value_main.10": 34, + "..___tag_value_main.11": 37, + "..___tag_value_main.12": 44, + "..___tag_value_main.13": 47, + "..___tag_value_main.15": 56, + "..___tag_value_main.19": 59, + "..___tag_value_main.2": 5, + "..___tag_value_main.4": 8, + "..___tag_value_main.5": 11, + "..___tag_value_main.8": 18, + "..___tag_value_main.9": 21, ".L_2__STRING.0": 64, ".L_2__STRING.1": 77, "main": 3 diff --git a/test/filters-cases/icc.hellow.asm.directives.labels.approved.txt b/test/filters-cases/icc.hellow.asm.directives.labels.approved.txt index dc27e86a7a6..9f5c794c289 100644 --- a/test/filters-cases/icc.hellow.asm.directives.labels.approved.txt +++ b/test/filters-cases/icc.hellow.asm.directives.labels.approved.txt @@ -20,6 +20,16 @@ "source": null, "text": "main:" }, + { + "labels": [], + "source": null, + "text": "..B1.1: # Preds ..B1.0" + }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.2: #" + }, { "labels": [], "source": { @@ -28,6 +38,11 @@ }, "text": " pushq %rbp #2.12" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.4: #" + }, { "labels": [], "source": { @@ -36,6 +51,11 @@ }, "text": " movq %rsp, %rbp #2.12" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.5: #" + }, { "labels": [], "source": { @@ -60,6 +80,11 @@ }, "text": " movl $3, %edi #2.12" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.8: #2.12" + }, { "labels": [], "source": { @@ -68,11 +93,21 @@ }, "text": " call __intel_new_proc_init #2.12" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.9: #" + }, { "labels": [], "source": null, "text": " # LOE rbx r12 r13 r14 r15" }, + { + "labels": [], + "source": null, + "text": "..B1.6: # Preds ..B1.1" + }, { "labels": [], "source": { @@ -113,6 +148,11 @@ }, "text": " ldmxcsr (%rsp) #2.12" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.10: #3.1" + }, { "labels": [], "source": { @@ -121,11 +161,21 @@ }, "text": " call printf #3.1" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.11: #" + }, { "labels": [], "source": null, "text": " # LOE rbx r12 r13 r14 r15" }, + { + "labels": [], + "source": null, + "text": "..B1.2: # Preds ..B1.6" + }, { "labels": [], "source": { @@ -142,6 +192,11 @@ }, "text": " xorl %eax, %eax #4.3" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.12: #4.3" + }, { "labels": [], "source": { @@ -150,11 +205,21 @@ }, "text": " call printf #4.3" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.13: #" + }, { "labels": [], "source": null, "text": " # LOE rbx r12 r13 r14 r15" }, + { + "labels": [], + "source": null, + "text": "..B1.3: # Preds ..B1.2" + }, { "labels": [], "source": { @@ -179,6 +244,11 @@ }, "text": " popq %rbp #5.1" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.15: #" + }, { "labels": [], "source": { @@ -187,6 +257,11 @@ }, "text": " ret #5.1" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.19: #" + }, { "labels": [], "source": null, @@ -454,8 +529,23 @@ } ], "labelDefinitions": { - ".L_2__STRING.0": 30, - ".L_2__STRING.1": 43, + "..B1.1": 5, + "..B1.2": 28, + "..B1.3": 35, + "..B1.6": 18, + "..___tag_value_main.10": 24, + "..___tag_value_main.11": 26, + "..___tag_value_main.12": 31, + "..___tag_value_main.13": 33, + "..___tag_value_main.15": 39, + "..___tag_value_main.19": 41, + "..___tag_value_main.2": 6, + "..___tag_value_main.4": 8, + "..___tag_value_main.5": 10, + "..___tag_value_main.8": 14, + "..___tag_value_main.9": 16, + ".L_2__STRING.0": 45, + ".L_2__STRING.1": 58, "main": 4 } } diff --git a/test/filters-cases/icc.hellow.asm.directives.labels.comments.approved.txt b/test/filters-cases/icc.hellow.asm.directives.labels.comments.approved.txt index 8b8865e5154..4cf330ab21b 100644 --- a/test/filters-cases/icc.hellow.asm.directives.labels.comments.approved.txt +++ b/test/filters-cases/icc.hellow.asm.directives.labels.comments.approved.txt @@ -5,6 +5,16 @@ "source": null, "text": "main:" }, + { + "labels": [], + "source": null, + "text": "..B1.1: # Preds ..B1.0" + }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.2: #" + }, { "labels": [], "source": { @@ -13,6 +23,11 @@ }, "text": " pushq %rbp #2.12" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.4: #" + }, { "labels": [], "source": { @@ -21,6 +36,11 @@ }, "text": " movq %rsp, %rbp #2.12" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.5: #" + }, { "labels": [], "source": { @@ -45,6 +65,11 @@ }, "text": " movl $3, %edi #2.12" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.8: #2.12" + }, { "labels": [], "source": { @@ -53,6 +78,16 @@ }, "text": " call __intel_new_proc_init #2.12" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.9: #" + }, + { + "labels": [], + "source": null, + "text": "..B1.6: # Preds ..B1.1" + }, { "labels": [], "source": { @@ -93,6 +128,11 @@ }, "text": " ldmxcsr (%rsp) #2.12" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.10: #3.1" + }, { "labels": [], "source": { @@ -101,6 +141,16 @@ }, "text": " call printf #3.1" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.11: #" + }, + { + "labels": [], + "source": null, + "text": "..B1.2: # Preds ..B1.6" + }, { "labels": [], "source": { @@ -117,6 +167,11 @@ }, "text": " xorl %eax, %eax #4.3" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.12: #4.3" + }, { "labels": [], "source": { @@ -125,6 +180,16 @@ }, "text": " call printf #4.3" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.13: #" + }, + { + "labels": [], + "source": null, + "text": "..B1.3: # Preds ..B1.2" + }, { "labels": [], "source": { @@ -149,6 +214,11 @@ }, "text": " popq %rbp #5.1" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.15: #" + }, { "labels": [], "source": { @@ -157,6 +227,11 @@ }, "text": " ret #5.1" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.19: #" + }, { "labels": [], "source": null, @@ -254,8 +329,23 @@ } ], "labelDefinitions": { - ".L_2__STRING.0": 21, - ".L_2__STRING.1": 34, + "..B1.1": 2, + "..B1.2": 23, + "..B1.3": 29, + "..B1.6": 14, + "..___tag_value_main.10": 20, + "..___tag_value_main.11": 22, + "..___tag_value_main.12": 26, + "..___tag_value_main.13": 28, + "..___tag_value_main.15": 33, + "..___tag_value_main.19": 35, + "..___tag_value_main.2": 3, + "..___tag_value_main.4": 5, + "..___tag_value_main.5": 7, + "..___tag_value_main.8": 11, + "..___tag_value_main.9": 13, + ".L_2__STRING.0": 36, + ".L_2__STRING.1": 49, "main": 1 } } diff --git a/test/filters-cases/icc.hellow.asm.directives.labels.comments.library.approved.txt b/test/filters-cases/icc.hellow.asm.directives.labels.comments.library.approved.txt index 8b8865e5154..4cf330ab21b 100644 --- a/test/filters-cases/icc.hellow.asm.directives.labels.comments.library.approved.txt +++ b/test/filters-cases/icc.hellow.asm.directives.labels.comments.library.approved.txt @@ -5,6 +5,16 @@ "source": null, "text": "main:" }, + { + "labels": [], + "source": null, + "text": "..B1.1: # Preds ..B1.0" + }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.2: #" + }, { "labels": [], "source": { @@ -13,6 +23,11 @@ }, "text": " pushq %rbp #2.12" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.4: #" + }, { "labels": [], "source": { @@ -21,6 +36,11 @@ }, "text": " movq %rsp, %rbp #2.12" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.5: #" + }, { "labels": [], "source": { @@ -45,6 +65,11 @@ }, "text": " movl $3, %edi #2.12" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.8: #2.12" + }, { "labels": [], "source": { @@ -53,6 +78,16 @@ }, "text": " call __intel_new_proc_init #2.12" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.9: #" + }, + { + "labels": [], + "source": null, + "text": "..B1.6: # Preds ..B1.1" + }, { "labels": [], "source": { @@ -93,6 +128,11 @@ }, "text": " ldmxcsr (%rsp) #2.12" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.10: #3.1" + }, { "labels": [], "source": { @@ -101,6 +141,16 @@ }, "text": " call printf #3.1" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.11: #" + }, + { + "labels": [], + "source": null, + "text": "..B1.2: # Preds ..B1.6" + }, { "labels": [], "source": { @@ -117,6 +167,11 @@ }, "text": " xorl %eax, %eax #4.3" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.12: #4.3" + }, { "labels": [], "source": { @@ -125,6 +180,16 @@ }, "text": " call printf #4.3" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.13: #" + }, + { + "labels": [], + "source": null, + "text": "..B1.3: # Preds ..B1.2" + }, { "labels": [], "source": { @@ -149,6 +214,11 @@ }, "text": " popq %rbp #5.1" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.15: #" + }, { "labels": [], "source": { @@ -157,6 +227,11 @@ }, "text": " ret #5.1" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.19: #" + }, { "labels": [], "source": null, @@ -254,8 +329,23 @@ } ], "labelDefinitions": { - ".L_2__STRING.0": 21, - ".L_2__STRING.1": 34, + "..B1.1": 2, + "..B1.2": 23, + "..B1.3": 29, + "..B1.6": 14, + "..___tag_value_main.10": 20, + "..___tag_value_main.11": 22, + "..___tag_value_main.12": 26, + "..___tag_value_main.13": 28, + "..___tag_value_main.15": 33, + "..___tag_value_main.19": 35, + "..___tag_value_main.2": 3, + "..___tag_value_main.4": 5, + "..___tag_value_main.5": 7, + "..___tag_value_main.8": 11, + "..___tag_value_main.9": 13, + ".L_2__STRING.0": 36, + ".L_2__STRING.1": 49, "main": 1 } } diff --git a/test/filters-cases/icc.hellow.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt b/test/filters-cases/icc.hellow.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt index e088c1e98eb..7f5bf0cb87a 100644 --- a/test/filters-cases/icc.hellow.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt +++ b/test/filters-cases/icc.hellow.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt @@ -5,6 +5,16 @@ "source": null, "text": "main:" }, + { + "labels": [], + "source": null, + "text": "..B1.1: # Preds ..B1.0" + }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.2: #" + }, { "labels": [], "source": { @@ -14,6 +24,11 @@ }, "text": " pushq %rbp #2.12" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.4: #" + }, { "labels": [], "source": { @@ -23,6 +38,11 @@ }, "text": " movq %rsp, %rbp #2.12" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.5: #" + }, { "labels": [], "source": { @@ -50,6 +70,11 @@ }, "text": " movl $3, %edi #2.12" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.8: #2.12" + }, { "labels": [], "source": { @@ -59,6 +84,16 @@ }, "text": " call __intel_new_proc_init #2.12" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.9: #" + }, + { + "labels": [], + "source": null, + "text": "..B1.6: # Preds ..B1.1" + }, { "labels": [], "source": { @@ -104,6 +139,11 @@ }, "text": " ldmxcsr (%rsp) #2.12" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.10: #3.1" + }, { "labels": [], "source": { @@ -113,6 +153,16 @@ }, "text": " call printf #3.1" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.11: #" + }, + { + "labels": [], + "source": null, + "text": "..B1.2: # Preds ..B1.6" + }, { "labels": [], "source": { @@ -131,6 +181,11 @@ }, "text": " xorl %eax, %eax #4.3" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.12: #4.3" + }, { "labels": [], "source": { @@ -140,6 +195,16 @@ }, "text": " call printf #4.3" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.13: #" + }, + { + "labels": [], + "source": null, + "text": "..B1.3: # Preds ..B1.2" + }, { "labels": [], "source": { @@ -167,6 +232,11 @@ }, "text": " popq %rbp #5.1" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.15: #" + }, { "labels": [], "source": { @@ -176,6 +246,11 @@ }, "text": " ret #5.1" }, + { + "labels": [], + "source": null, + "text": "..___tag_value_main.19: #" + }, { "labels": [], "source": null, @@ -273,8 +348,23 @@ } ], "labelDefinitions": { - ".L_2__STRING.0": 21, - ".L_2__STRING.1": 34, + "..B1.1": 2, + "..B1.2": 23, + "..B1.3": 29, + "..B1.6": 14, + "..___tag_value_main.10": 20, + "..___tag_value_main.11": 22, + "..___tag_value_main.12": 26, + "..___tag_value_main.13": 28, + "..___tag_value_main.15": 33, + "..___tag_value_main.19": 35, + "..___tag_value_main.2": 3, + "..___tag_value_main.4": 5, + "..___tag_value_main.5": 7, + "..___tag_value_main.8": 11, + "..___tag_value_main.9": 13, + ".L_2__STRING.0": 36, + ".L_2__STRING.1": 49, "main": 1 } } diff --git a/test/filters-cases/icc.hellow.asm.directives.library.approved.txt b/test/filters-cases/icc.hellow.asm.directives.library.approved.txt index 654ec0d1318..6a5dd564a72 100644 --- a/test/filters-cases/icc.hellow.asm.directives.library.approved.txt +++ b/test/filters-cases/icc.hellow.asm.directives.library.approved.txt @@ -699,6 +699,21 @@ } ], "labelDefinitions": { + "..B1.1": 7, + "..B1.2": 44, + "..B1.3": 55, + "..B1.6": 27, + "..___tag_value_main.10": 38, + "..___tag_value_main.11": 41, + "..___tag_value_main.12": 49, + "..___tag_value_main.13": 52, + "..___tag_value_main.15": 62, + "..___tag_value_main.19": 65, + "..___tag_value_main.2": 8, + "..___tag_value_main.4": 11, + "..___tag_value_main.5": 14, + "..___tag_value_main.8": 21, + "..___tag_value_main.9": 24, ".L_2__STRING.0": 73, ".L_2__STRING.1": 86, "main": 6 diff --git a/test/filters-cases/icc.hellow.asm.none.approved.txt b/test/filters-cases/icc.hellow.asm.none.approved.txt index bb74380a53f..1fd06a44f39 100644 --- a/test/filters-cases/icc.hellow.asm.none.approved.txt +++ b/test/filters-cases/icc.hellow.asm.none.approved.txt @@ -1732,12 +1732,22 @@ } ], "labelDefinitions": { + "..B1.1": 12, + "..B1.2": 54, + "..B1.3": 66, + "..B1.6": 34, "..LNmain.24": 85, + "..___tag_value_main.10": 47, + "..___tag_value_main.11": 51, + "..___tag_value_main.12": 60, + "..___tag_value_main.13": 63, "..___tag_value_main.15": 74, "..___tag_value_main.19": 78, "..___tag_value_main.2": 13, "..___tag_value_main.4": 18, "..___tag_value_main.5": 21, + "..___tag_value_main.8": 28, + "..___tag_value_main.9": 31, ".L_2__STRING.0": 92, ".L_2__STRING.1": 108, ".debug_abbrev_seg": 213, diff --git a/test/filters-cases/llvm-ir-bug957.asm.directives.approved.txt b/test/filters-cases/llvm-ir-bug957.asm.directives.approved.txt index 3d7061c6ae0..c92266f04da 100644 --- a/test/filters-cases/llvm-ir-bug957.asm.directives.approved.txt +++ b/test/filters-cases/llvm-ir-bug957.asm.directives.approved.txt @@ -144,6 +144,7 @@ "labelDefinitions": { ".loopexit": 8, ".preheader": 11, - "bb": 4 + "bb": 4, + "source_filename": 1 } } diff --git a/test/filters-cases/llvm-ir-bug957.asm.directives.comments.approved.txt b/test/filters-cases/llvm-ir-bug957.asm.directives.comments.approved.txt index 3d7061c6ae0..c92266f04da 100644 --- a/test/filters-cases/llvm-ir-bug957.asm.directives.comments.approved.txt +++ b/test/filters-cases/llvm-ir-bug957.asm.directives.comments.approved.txt @@ -144,6 +144,7 @@ "labelDefinitions": { ".loopexit": 8, ".preheader": 11, - "bb": 4 + "bb": 4, + "source_filename": 1 } } diff --git a/test/filters-cases/llvm-ir-bug957.asm.directives.labels.approved.txt b/test/filters-cases/llvm-ir-bug957.asm.directives.labels.approved.txt index 94dd67ad305..c92266f04da 100644 --- a/test/filters-cases/llvm-ir-bug957.asm.directives.labels.approved.txt +++ b/test/filters-cases/llvm-ir-bug957.asm.directives.labels.approved.txt @@ -1,5 +1,15 @@ { "asm": [ + { + "labels": [], + "source": null, + "text": "source_filename = \"./example.ll\"" + }, + { + "labels": [], + "source": null, + "text": "" + }, { "labels": [], "source": null, @@ -132,8 +142,9 @@ } ], "labelDefinitions": { - ".loopexit": 6, - ".preheader": 9, - "bb": 2 + ".loopexit": 8, + ".preheader": 11, + "bb": 4, + "source_filename": 1 } } diff --git a/test/filters-cases/llvm-ir-bug957.asm.directives.labels.comments.approved.txt b/test/filters-cases/llvm-ir-bug957.asm.directives.labels.comments.approved.txt index 94dd67ad305..c92266f04da 100644 --- a/test/filters-cases/llvm-ir-bug957.asm.directives.labels.comments.approved.txt +++ b/test/filters-cases/llvm-ir-bug957.asm.directives.labels.comments.approved.txt @@ -1,5 +1,15 @@ { "asm": [ + { + "labels": [], + "source": null, + "text": "source_filename = \"./example.ll\"" + }, + { + "labels": [], + "source": null, + "text": "" + }, { "labels": [], "source": null, @@ -132,8 +142,9 @@ } ], "labelDefinitions": { - ".loopexit": 6, - ".preheader": 9, - "bb": 2 + ".loopexit": 8, + ".preheader": 11, + "bb": 4, + "source_filename": 1 } } diff --git a/test/filters-cases/llvm-ir-bug957.asm.directives.labels.comments.library.approved.txt b/test/filters-cases/llvm-ir-bug957.asm.directives.labels.comments.library.approved.txt index 94dd67ad305..c92266f04da 100644 --- a/test/filters-cases/llvm-ir-bug957.asm.directives.labels.comments.library.approved.txt +++ b/test/filters-cases/llvm-ir-bug957.asm.directives.labels.comments.library.approved.txt @@ -1,5 +1,15 @@ { "asm": [ + { + "labels": [], + "source": null, + "text": "source_filename = \"./example.ll\"" + }, + { + "labels": [], + "source": null, + "text": "" + }, { "labels": [], "source": null, @@ -132,8 +142,9 @@ } ], "labelDefinitions": { - ".loopexit": 6, - ".preheader": 9, - "bb": 2 + ".loopexit": 8, + ".preheader": 11, + "bb": 4, + "source_filename": 1 } } diff --git a/test/filters-cases/llvm-ir-bug957.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt b/test/filters-cases/llvm-ir-bug957.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt index 94dd67ad305..c92266f04da 100644 --- a/test/filters-cases/llvm-ir-bug957.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt +++ b/test/filters-cases/llvm-ir-bug957.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt @@ -1,5 +1,15 @@ { "asm": [ + { + "labels": [], + "source": null, + "text": "source_filename = \"./example.ll\"" + }, + { + "labels": [], + "source": null, + "text": "" + }, { "labels": [], "source": null, @@ -132,8 +142,9 @@ } ], "labelDefinitions": { - ".loopexit": 6, - ".preheader": 9, - "bb": 2 + ".loopexit": 8, + ".preheader": 11, + "bb": 4, + "source_filename": 1 } } diff --git a/test/filters-cases/llvm-ir-bug957.asm.directives.library.approved.txt b/test/filters-cases/llvm-ir-bug957.asm.directives.library.approved.txt index 3d7061c6ae0..c92266f04da 100644 --- a/test/filters-cases/llvm-ir-bug957.asm.directives.library.approved.txt +++ b/test/filters-cases/llvm-ir-bug957.asm.directives.library.approved.txt @@ -144,6 +144,7 @@ "labelDefinitions": { ".loopexit": 8, ".preheader": 11, - "bb": 4 + "bb": 4, + "source_filename": 1 } } diff --git a/test/filters-cases/mips5-square.asm.directives.approved.txt b/test/filters-cases/mips5-square.asm.directives.approved.txt index b949c35e607..06d7765f17a 100644 --- a/test/filters-cases/mips5-square.asm.directives.approved.txt +++ b/test/filters-cases/mips5-square.asm.directives.approved.txt @@ -163,6 +163,7 @@ } ], "labelDefinitions": { + "$LFB0": 2, "_Z6squarei": 3 } } diff --git a/test/filters-cases/mips5-square.asm.directives.comments.approved.txt b/test/filters-cases/mips5-square.asm.directives.comments.approved.txt index b949c35e607..06d7765f17a 100644 --- a/test/filters-cases/mips5-square.asm.directives.comments.approved.txt +++ b/test/filters-cases/mips5-square.asm.directives.comments.approved.txt @@ -163,6 +163,7 @@ } ], "labelDefinitions": { + "$LFB0": 2, "_Z6squarei": 3 } } diff --git a/test/filters-cases/mips5-square.asm.directives.labels.approved.txt b/test/filters-cases/mips5-square.asm.directives.labels.approved.txt index a514400fc63..b15810dc9a4 100644 --- a/test/filters-cases/mips5-square.asm.directives.labels.approved.txt +++ b/test/filters-cases/mips5-square.asm.directives.labels.approved.txt @@ -1,5 +1,10 @@ { "asm": [ + { + "labels": [], + "source": null, + "text": "$LFB0 = ." + }, { "labels": [], "source": null, @@ -108,6 +113,7 @@ } ], "labelDefinitions": { - "_Z6squarei": 1 + "$LFB0": 1, + "_Z6squarei": 2 } } diff --git a/test/filters-cases/mips5-square.asm.directives.labels.comments.approved.txt b/test/filters-cases/mips5-square.asm.directives.labels.comments.approved.txt index a514400fc63..b15810dc9a4 100644 --- a/test/filters-cases/mips5-square.asm.directives.labels.comments.approved.txt +++ b/test/filters-cases/mips5-square.asm.directives.labels.comments.approved.txt @@ -1,5 +1,10 @@ { "asm": [ + { + "labels": [], + "source": null, + "text": "$LFB0 = ." + }, { "labels": [], "source": null, @@ -108,6 +113,7 @@ } ], "labelDefinitions": { - "_Z6squarei": 1 + "$LFB0": 1, + "_Z6squarei": 2 } } diff --git a/test/filters-cases/mips5-square.asm.directives.labels.comments.library.approved.txt b/test/filters-cases/mips5-square.asm.directives.labels.comments.library.approved.txt index a514400fc63..b15810dc9a4 100644 --- a/test/filters-cases/mips5-square.asm.directives.labels.comments.library.approved.txt +++ b/test/filters-cases/mips5-square.asm.directives.labels.comments.library.approved.txt @@ -1,5 +1,10 @@ { "asm": [ + { + "labels": [], + "source": null, + "text": "$LFB0 = ." + }, { "labels": [], "source": null, @@ -108,6 +113,7 @@ } ], "labelDefinitions": { - "_Z6squarei": 1 + "$LFB0": 1, + "_Z6squarei": 2 } } diff --git a/test/filters-cases/mips5-square.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt b/test/filters-cases/mips5-square.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt index 9b6afa7279f..d8833c9d889 100644 --- a/test/filters-cases/mips5-square.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt +++ b/test/filters-cases/mips5-square.asm.directives.labels.comments.library.dontMaskFilenames.approved.txt @@ -1,5 +1,10 @@ { "asm": [ + { + "labels": [], + "source": null, + "text": "$LFB0 = ." + }, { "labels": [], "source": null, @@ -120,6 +125,7 @@ } ], "labelDefinitions": { - "_Z6squarei": 1 + "$LFB0": 1, + "_Z6squarei": 2 } } diff --git a/test/filters-cases/mips5-square.asm.directives.library.approved.txt b/test/filters-cases/mips5-square.asm.directives.library.approved.txt index b949c35e607..06d7765f17a 100644 --- a/test/filters-cases/mips5-square.asm.directives.library.approved.txt +++ b/test/filters-cases/mips5-square.asm.directives.library.approved.txt @@ -163,6 +163,7 @@ } ], "labelDefinitions": { + "$LFB0": 2, "_Z6squarei": 3 } }