DI: Remove DW_TAG_arg_variable and DW_TAG_auto_variable

Remove the fake `DW_TAG_auto_variable` and `DW_TAG_arg_variable` tags,
using `DW_TAG_variable` in their place Stop exposing the `tag:` field at
all in the assembly format for `DILocalVariable`.

Most of the testcase updates were generated by the following sed script:

    find test/ -name "*.ll" -o -name "*.mir" |
    xargs grep -l 'DILocalVariable' |
    xargs sed -i '' \
      -e 's/tag: DW_TAG_arg_variable, //' \
      -e 's/tag: DW_TAG_auto_variable, //'

There were only a handful of tests in `test/Assembly` that I needed to
update by hand.

(Note: a follow-up could change `DILocalVariable::DILocalVariable()` to
set the tag to `DW_TAG_formal_parameter` instead of `DW_TAG_variable`
(as appropriate), instead of having that logic magically in the backend
in `DbgVariable`.  I've added a FIXME to that effect.)

llvm-svn: 243774

7 files changed, 20 insertions, 24 deletions

diff --git a/llvm/test/Assembler/2010-02-05-FunctionLocalMetadataBecomesNull.ll b/llvm/test/Assembler/2010-02-05-FunctionLocalMetadataBecomesNull.ll
index 8a6735fbca4..df9719baf07 100644
--- a/llvm/test/Assembler/2010-02-05-FunctionLocalMetadataBecomesNull.ll
+++ b/llvm/test/Assembler/2010-02-05-FunctionLocalMetadataBecomesNull.ll
@@ -26,7 +26,7 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone
 
 !7 = !{!1}
 !6 = !DICompileUnit(language: DW_LANG_C99, producer: "clang version 3.0 (trunk 131941)", isOptimized: true, emissionKind: 0, file: !8, enums: !9, retainedTypes: !9, subprograms: !7)
-!0 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "c", line: 2, scope: !1, file: !2, type: !5)
+!0 = !DILocalVariable(name: "c", line: 2, scope: !1, file: !2, type: !5)
 !1 = !DISubprogram(name: "main", line: 1, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, scopeLine: 1, file: !8, scope: !2, type: !3, function: i32 ()* @main)
 !2 = !DIFile(filename: "/d/j/debug-test.c", directory: "/Volumes/Data/b")
 !3 = !DISubroutineType(types: !4)
diff --git a/llvm/test/Assembler/dilocalvariable-arg-large.ll b/llvm/test/Assembler/dilocalvariable-arg-large.ll
index 7788186a54a..a4c3f8c9763 100644
--- a/llvm/test/Assembler/dilocalvariable-arg-large.ll
+++ b/llvm/test/Assembler/dilocalvariable-arg-large.ll
@@ -6,5 +6,5 @@
 
 !0 = distinct !DISubprogram()
 
-; CHECK: !1 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "foo", arg: 65535, scope: !0)
-!1 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "foo", arg: 65535, scope: !0)
+; CHECK: !1 = !DILocalVariable(name: "foo", arg: 65535, scope: !0)
+!1 = !DILocalVariable(name: "foo", arg: 65535, scope: !0)
diff --git a/llvm/test/Assembler/dilocalvariable.ll b/llvm/test/Assembler/dilocalvariable.ll
index affe6105e1c..d286dd92a40 100644
--- a/llvm/test/Assembler/dilocalvariable.ll
+++ b/llvm/test/Assembler/dilocalvariable.ll
@@ -12,15 +12,15 @@
 !3 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed)
 !4 = !DILocation(scope: !0)
 
-; CHECK: !5 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "foo", arg: 3, scope: !0, file: !2, line: 7, type: !3, flags: DIFlagArtificial)
-; CHECK: !6 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "foo", scope: !0, file: !2, line: 7, type: !3, flags: DIFlagArtificial)
-!5 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "foo", arg: 3,
+; CHECK: !5 = !DILocalVariable(name: "foo", arg: 3, scope: !0, file: !2, line: 7, type: !3, flags: DIFlagArtificial)
+; CHECK: !6 = !DILocalVariable(name: "foo", scope: !0, file: !2, line: 7, type: !3, flags: DIFlagArtificial)
+!5 = !DILocalVariable(name: "foo", arg: 3,
                       scope: !0, file: !2, line: 7, type: !3,
                       flags: DIFlagArtificial)
-!6 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "foo", scope: !0,
+!6 = !DILocalVariable(name: "foo", scope: !0,
                       file: !2, line: 7, type: !3, flags: DIFlagArtificial)
 
-; CHECK: !7 = !DILocalVariable(tag: DW_TAG_arg_variable, arg: 1, scope: !0)
-; CHECK: !8 = !DILocalVariable(tag: DW_TAG_auto_variable, scope: !0)
-!7 = !DILocalVariable(tag: DW_TAG_arg_variable, scope: !0, arg: 1)
-!8 = !DILocalVariable(tag: DW_TAG_auto_variable, scope: !0)
+; CHECK: !7 = !DILocalVariable(arg: 1, scope: !0)
+; CHECK: !8 = !DILocalVariable(scope: !0)
+!7 = !DILocalVariable(scope: !0, arg: 1)
+!8 = !DILocalVariable(scope: !0)
diff --git a/llvm/test/Assembler/invalid-dilocalvariable-arg-large.ll b/llvm/test/Assembler/invalid-dilocalvariable-arg-large.ll
index d62da601e13..e6e4a76b1c1 100644
--- a/llvm/test/Assembler/invalid-dilocalvariable-arg-large.ll
+++ b/llvm/test/Assembler/invalid-dilocalvariable-arg-large.ll
@@ -1,6 +1,6 @@
 ; RUN: not llvm-as < %s 2>&1 | FileCheck %s
 
-!0 = !DILocalVariable(tag: DW_TAG_arg_variable, scope: !{}, arg: 65535)
+!0 = !DILocalVariable(scope: !{}, arg: 65535)
 
-; CHECK: <stdin>:[[@LINE+1]]:66: error: value for 'arg' too large, limit is 65535
-!1 = !DILocalVariable(tag: DW_TAG_arg_variable, scope: !{}, arg: 65536)
+; CHECK: <stdin>:[[@LINE+1]]:40: error: value for 'arg' too large, limit is 65535
+!1 = !DILocalVariable(scope: !{}, arg: 65536)
diff --git a/llvm/test/Assembler/invalid-dilocalvariable-arg-negative.ll b/llvm/test/Assembler/invalid-dilocalvariable-arg-negative.ll
index ff90d66fa11..9cf8e973db2 100644
--- a/llvm/test/Assembler/invalid-dilocalvariable-arg-negative.ll
+++ b/llvm/test/Assembler/invalid-dilocalvariable-arg-negative.ll
@@ -1,7 +1,7 @@
 ; RUN: not llvm-as < %s 2>&1 | FileCheck %s
 
-!0 = !DILocalVariable(tag: DW_TAG_arg_variable, scope: !{}, arg: 1)
-!1 = !DILocalVariable(tag: DW_TAG_auto_variable, scope: !{}, arg: 0)
+!0 = !DILocalVariable(scope: !{}, arg: 1)
+!1 = !DILocalVariable(scope: !{})
 
-; CHECK: <stdin>:[[@LINE+1]]:66: error: expected unsigned integer
-!2 = !DILocalVariable(tag: DW_TAG_arg_variable, scope: !{}, arg: -1)
+; CHECK: <stdin>:[[@LINE+1]]:40: error: expected unsigned integer
+!2 = !DILocalVariable(scope: !{}, arg: -1)
diff --git a/llvm/test/Assembler/invalid-dilocalvariable-missing-scope.ll b/llvm/test/Assembler/invalid-dilocalvariable-missing-scope.ll
index 45dcad71360..86bf52ddf2d 100644
--- a/llvm/test/Assembler/invalid-dilocalvariable-missing-scope.ll
+++ b/llvm/test/Assembler/invalid-dilocalvariable-missing-scope.ll
@@ -1,4 +1,4 @@
 ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s
 
-; CHECK: <stdin>:[[@LINE+1]]:48: error: missing required field 'scope'
-!0 = !DILocalVariable(tag: DW_TAG_auto_variable)
+; CHECK: <stdin>:[[@LINE+1]]:23: error: missing required field 'scope'
+!0 = !DILocalVariable()
diff --git a/llvm/test/Assembler/invalid-dilocalvariable-missing-tag.ll b/llvm/test/Assembler/invalid-dilocalvariable-missing-tag.ll
deleted file mode 100644
index 18062edf75b..00000000000
--- a/llvm/test/Assembler/invalid-dilocalvariable-missing-tag.ll
+++ /dev/null
@@ -1,4 +0,0 @@
-; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s
-
-; CHECK: <stdin>:[[@LINE+1]]:45: error: missing required field 'tag'
-!0 = !DILocalVariable(scope: !DISubprogram())