IR: Drop scope from MDTemplateParameter

Follow-up to r229740, which removed `DITemplate*::getContext()` after my
upgrade script revealed that scopes are always `nullptr` for template
parameters.  This is the other shoe: drop `scope:` from
`MDTemplateParameter` and its two subclasses.  (Note: a bitcode upgrade
would be pointless, since the hierarchy hasn't been moved into place.)

llvm-svn: 229791

7 files changed, 18 insertions, 27 deletions

diff --git a/llvm/test/Assembler/invalid-mdtemplatetypeparameter-missing-parent.ll b/llvm/test/Assembler/invalid-mdtemplatetypeparameter-missing-parent.ll
deleted file mode 100644
index 741506ee0cf..00000000000
--- a/llvm/test/Assembler/invalid-mdtemplatetypeparameter-missing-parent.ll
+++ /dev/null
@@ -1,4 +0,0 @@
-; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s
-
-; CHECK: [[@LINE+1]]:40: error: missing required field 'scope'
-!0 = !MDTemplateTypeParameter(type: !{})
diff --git a/llvm/test/Assembler/invalid-mdtemplatetypeparameter-missing-type.ll b/llvm/test/Assembler/invalid-mdtemplatetypeparameter-missing-type.ll
index 8fd9bdf5858..62bee70d947 100644
--- a/llvm/test/Assembler/invalid-mdtemplatetypeparameter-missing-type.ll
+++ b/llvm/test/Assembler/invalid-mdtemplatetypeparameter-missing-type.ll
@@ -1,4 +1,4 @@
 ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s
 
-; CHECK: [[@LINE+1]]:41: error: missing required field 'type'
-!0 = !MDTemplateTypeParameter(scope: !{})
+; CHECK: [[@LINE+1]]:44: error: missing required field 'type'
+!0 = !MDTemplateTypeParameter(name: "param")
diff --git a/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-parent.ll b/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-parent.ll
deleted file mode 100644
index 1b9053f757f..00000000000
--- a/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-parent.ll
+++ /dev/null
@@ -1,5 +0,0 @@
-; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s
-
-; CHECK: [[@LINE+2]]:44: error: missing required field 'scope'
-!0 = !MDTemplateValueParameter(tag: DW_TAG_template_value_parameter, type: !{},
-                               value: i32 7)
diff --git a/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-tag.ll b/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-tag.ll
index db755c98c60..fea218c51b5 100644
--- a/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-tag.ll
+++ b/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-tag.ll
@@ -1,4 +1,4 @@
 ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s
 
-; CHECK: [[@LINE+1]]:67: error: missing required field 'tag'
-!0 = !MDTemplateValueParameter(scope: !{}, type: !{}, value: i32 7)
+; CHECK: [[@LINE+1]]:55: error: missing required field 'tag'
+!0 = !MDTemplateValueParameter(type: !{}, value: i32 7)
diff --git a/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-type.ll b/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-type.ll
index 2db944ec89f..8ea3acceba4 100644
--- a/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-type.ll
+++ b/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-type.ll
@@ -1,5 +1,5 @@
 ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s
 
-; CHECK: [[@LINE+2]]:56: error: missing required field 'type'
+; CHECK: [[@LINE+2]]:44: error: missing required field 'type'
 !0 = !MDTemplateValueParameter(tag: DW_TAG_template_value_parameter,
-                               scope: !{}, value: i32 7)
+                               value: i32 7)
diff --git a/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-value.ll b/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-value.ll
index 8ca04377c68..e1e3f81d269 100644
--- a/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-value.ll
+++ b/llvm/test/Assembler/invalid-mdtemplatevalueparameter-missing-value.ll
@@ -1,5 +1,5 @@
 ; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s
 
-; CHECK: [[@LINE+2]]:53: error: missing required field 'value'
+; CHECK: [[@LINE+2]]:41: error: missing required field 'value'
 !0 = !MDTemplateValueParameter(tag: DW_TAG_template_value_parameter,
-                               scope: !{}, type: !{})
+                               type: !{})
diff --git a/llvm/test/Assembler/mdtemplateparameter.ll b/llvm/test/Assembler/mdtemplateparameter.ll
index aef2bfd21b2..f005c08b380 100644
--- a/llvm/test/Assembler/mdtemplateparameter.ll
+++ b/llvm/test/Assembler/mdtemplateparameter.ll
@@ -8,17 +8,17 @@
 !1 = distinct !{}
 ; CHECK: !1 = distinct !{}
 
-; CHECK-NEXT: !2 = !MDTemplateTypeParameter(scope: !0, name: "Ty", type: !1)
-; CHECK-NEXT: !3 = !MDTemplateTypeParameter(scope: !0, name: "", type: !1)
-!2 = !MDTemplateTypeParameter(scope: !0, name: "Ty", type: !1)
-!3 = !MDTemplateTypeParameter(scope: !0, type: !1)
-!4 = !MDTemplateTypeParameter(scope: !0, name: "", type: !1)
+; CHECK-NEXT: !2 = !MDTemplateTypeParameter(name: "Ty", type: !1)
+; CHECK-NEXT: !3 = !MDTemplateTypeParameter(name: "", type: !1)
+!2 = !MDTemplateTypeParameter(name: "Ty", type: !1)
+!3 = !MDTemplateTypeParameter(type: !1)
+!4 = !MDTemplateTypeParameter(name: "", type: !1)
 
-; CHECK-NEXT: !4 = !MDTemplateValueParameter(tag: DW_TAG_template_value_parameter, scope: !0, name: "V", type: !1, value: i32 7)
-; CHECK-NEXT: !5 = !MDTemplateValueParameter(tag: DW_TAG_template_value_parameter, scope: !0, name: "", type: !1, value: i32 7)
+; CHECK-NEXT: !4 = !MDTemplateValueParameter(tag: DW_TAG_template_value_parameter, name: "V", type: !1, value: i32 7)
+; CHECK-NEXT: !5 = !MDTemplateValueParameter(tag: DW_TAG_template_value_parameter, name: "", type: !1, value: i32 7)
 !5 = !MDTemplateValueParameter(tag: DW_TAG_template_value_parameter,
-                               scope: !0, name: "V", type: !1, value: i32 7)
+                               name: "V", type: !1, value: i32 7)
 !6 = !MDTemplateValueParameter(tag: DW_TAG_template_value_parameter,
-                               scope: !0, type: !1, value: i32 7)
+                               type: !1, value: i32 7)
 !7 = !MDTemplateValueParameter(tag: DW_TAG_template_value_parameter,
-                               scope: !0, name: "", type: !1, value: i32 7)
+                               name: "", type: !1, value: i32 7)