From 802b22b5c8c30bebc1695a217478be02653c6b53 Mon Sep 17 00:00:00 2001
From: Hans Wennborg <hans@chromium.org>
Date: Mon, 2 Mar 2020 09:26:00 +0100
Subject: Revert "[DebugInfo][clang][DWARF5]: Added support for debuginfo
 generation for defaulted parameters"

The Bitcode/DITemplateParameter-5.0.ll test is failing:

FAIL: LLVM :: Bitcode/DITemplateParameter-5.0.ll (5894 of 36324)
******************** TEST 'LLVM :: Bitcode/DITemplateParameter-5.0.ll' FAILED ********************
Script:
--
: 'RUN: at line 1';   /usr/local/google/home/thakis/src/llvm-project/out/gn/bin/llvm-dis -o - /usr/local/google/home/thakis/src/llvm-project/llvm/test/Bitcode/DITemplateParameter-5.0.ll.bc | /usr/local/google/home/thakis/src/llvm-project/out/gn/bin/FileCheck /usr/local/google/home/thakis/src/llvm-project/llvm/test/Bitcode/DITemplateParameter-5.0.ll
--
Exit Code: 2

Command Output (stderr):
--

It looks like the Bitcode/DITemplateParameter-5.0.ll.bc file was never checked in.

This reverts commit c2b437d53d40b6dc5603c97f527398f477d9c5f1.
---
 llvm/lib/Bitcode/Reader/MetadataLoader.cpp | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

(limited to 'llvm/lib/Bitcode/Reader/MetadataLoader.cpp')

diff --git a/llvm/lib/Bitcode/Reader/MetadataLoader.cpp b/llvm/lib/Bitcode/Reader/MetadataLoader.cpp
index 9a78a2bbcb4f..3cff468dca89 100644
--- a/llvm/lib/Bitcode/Reader/MetadataLoader.cpp
+++ b/llvm/lib/Bitcode/Reader/MetadataLoader.cpp
@@ -1668,34 +1668,27 @@ Error MetadataLoader::MetadataLoaderImpl::parseOneMetadata(
     break;
   }
   case bitc::METADATA_TEMPLATE_TYPE: {
-    if (Record.size() < 3 || Record.size() > 4)
+    if (Record.size() != 3)
       return error("Invalid record");
 
     IsDistinct = Record[0];
-    MetadataList.assignValue(
-        GET_OR_DISTINCT(DITemplateTypeParameter,
-                        (Context, getMDString(Record[1]),
-                         getDITypeRefOrNull(Record[2]),
-                         (Record.size() == 4) ? getMDOrNull(Record[3])
-                                              : getMDOrNull(false))),
-        NextMetadataNo);
+    MetadataList.assignValue(GET_OR_DISTINCT(DITemplateTypeParameter,
+                                             (Context, getMDString(Record[1]),
+                                              getDITypeRefOrNull(Record[2]))),
+                             NextMetadataNo);
     NextMetadataNo++;
     break;
   }
   case bitc::METADATA_TEMPLATE_VALUE: {
-    if (Record.size() < 5 || Record.size() > 6)
+    if (Record.size() != 5)
       return error("Invalid record");
 
     IsDistinct = Record[0];
-
     MetadataList.assignValue(
-        GET_OR_DISTINCT(
-            DITemplateValueParameter,
-            (Context, Record[1], getMDString(Record[2]),
-             getDITypeRefOrNull(Record[3]),
-             (Record.size() == 6) ? getMDOrNull(Record[4]) : getMDOrNull(false),
-             (Record.size() == 6) ? getMDOrNull(Record[5])
-                                  : getMDOrNull(Record[4]))),
+        GET_OR_DISTINCT(DITemplateValueParameter,
+                        (Context, Record[1], getMDString(Record[2]),
+                         getDITypeRefOrNull(Record[3]),
+                         getMDOrNull(Record[4]))),
         NextMetadataNo);
     NextMetadataNo++;
     break;
-- 
cgit v1.2.3