DebugInfo: Really support 2^16 arguments in a subprogram
authorDuncan P. N. Exon Smith <dexonsmith@apple.com>
Tue, 2 Jun 2015 17:17:44 +0000 (17:17 +0000)
committerDuncan P. N. Exon Smith <dexonsmith@apple.com>
Tue, 2 Jun 2015 17:17:44 +0000 (17:17 +0000)
As a follow-up to r235955, actually support up to 65535 arguments in a
subprogram.  r235955 missed assembly support, having only tested the new
limit via C++ unit tests.  Code patch by Amjad Aboud.

llvm-svn: 238854

llvm/lib/AsmParser/LLParser.cpp
llvm/test/Assembler/dilocalvariable-arg-large.ll [new file with mode: 0644]
llvm/test/Assembler/invalid-dilocalvariable-arg-large.ll [new file with mode: 0644]
llvm/test/Assembler/invalid-dilocalvariable-arg-negative.ll [new file with mode: 0644]

index 28419fb..681af2a 100644 (file)
@@ -3730,7 +3730,7 @@ bool LLParser::ParseDILocalVariable(MDNode *&Result, bool IsDistinct) {
   OPTIONAL(file, MDField, );                                                   \
   OPTIONAL(line, LineField, );                                                 \
   OPTIONAL(type, MDField, );                                                   \
-  OPTIONAL(arg, MDUnsignedField, (0, UINT8_MAX));                              \
+  OPTIONAL(arg, MDUnsignedField, (0, UINT16_MAX));                             \
   OPTIONAL(flags, DIFlagField, );
   PARSE_MD_FIELDS();
 #undef VISIT_MD_FIELDS
diff --git a/llvm/test/Assembler/dilocalvariable-arg-large.ll b/llvm/test/Assembler/dilocalvariable-arg-large.ll
new file mode 100644 (file)
index 0000000..7788186
--- /dev/null
@@ -0,0 +1,10 @@
+; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | FileCheck %s
+; RUN: verify-uselistorder %s
+
+; CHECK: !named = !{!0, !1}
+!named = !{!0, !1}
+
+!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)
diff --git a/llvm/test/Assembler/invalid-dilocalvariable-arg-large.ll b/llvm/test/Assembler/invalid-dilocalvariable-arg-large.ll
new file mode 100644 (file)
index 0000000..d62da60
--- /dev/null
@@ -0,0 +1,6 @@
+; RUN: not llvm-as < %s 2>&1 | FileCheck %s
+
+!0 = !DILocalVariable(tag: DW_TAG_arg_variable, 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)
diff --git a/llvm/test/Assembler/invalid-dilocalvariable-arg-negative.ll b/llvm/test/Assembler/invalid-dilocalvariable-arg-negative.ll
new file mode 100644 (file)
index 0000000..08e370a
--- /dev/null
@@ -0,0 +1,6 @@
+; RUN: not llvm-as < %s 2>&1 | FileCheck %s
+
+!0 = !DILocalVariable(tag: DW_TAG_arg_variable, scope: !{}, arg: 0)
+
+; CHECK: <stdin>:[[@LINE+1]]:66: error: expected unsigned integer
+!1 = !DILocalVariable(tag: DW_TAG_arg_variable, scope: !{}, arg: -1)