From dd6087cac087046b5cd29a21e7fff2732fb35997 Mon Sep 17 00:00:00 2001
From: Nick Desaulniers <ndesaulniers@google.com>
Date: Tue, 17 Nov 2020 17:17:36 -0800
Subject: [PATCH] Revert "[BitCode] decode nossp fn attr"

This reverts commit 0b11d018cc2f2c6bea5dac8dc72140cdb502ca02.

Going with a simpler approach.
---
 llvm/lib/Bitcode/Reader/BitcodeReader.cpp | 2 --
 llvm/test/Bitcode/attributes.ll           | 7 -------
 2 files changed, 9 deletions(-)

diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
index eefb1877334f..a39d7a2365ae 100644
--- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -1537,8 +1537,6 @@ static Attribute::AttrKind getAttrFromCode(uint64_t Code) {
     return Attribute::ByRef;
   case bitc::ATTR_KIND_MUSTPROGRESS:
     return Attribute::MustProgress;
-  case bitc::ATTR_KIND_NO_STACK_PROTECT:
-    return Attribute::NoStackProtect;
   }
 }
 
diff --git a/llvm/test/Bitcode/attributes.ll b/llvm/test/Bitcode/attributes.ll
index 4e13bfaa660b..f87708e83471 100644
--- a/llvm/test/Bitcode/attributes.ll
+++ b/llvm/test/Bitcode/attributes.ll
@@ -404,12 +404,6 @@ define void @f68() mustprogress
   ret void
 }
 
-; CHECK; define void @f69() #42
-define void @f69() nossp
-{
-  ret void
-}
-
 ; CHECK: attributes #0 = { noreturn }
 ; CHECK: attributes #1 = { nounwind }
 ; CHECK: attributes #2 = { readnone }
@@ -452,5 +446,4 @@ define void @f69() nossp
 ; CHECK: attributes #39 = { sanitize_memtag }
 ; CHECK: attributes #40 = { null_pointer_is_valid }
 ; CHECK: attributes #41 = { mustprogress }
-; CHECK: attributes #42 = { nossp }
 ; CHECK: attributes #[[NOBUILTIN]] = { nobuiltin }