From 80ec0ebfdc5692a58e0832125f2c6a991df9d63f Mon Sep 17 00:00:00 2001
From: Mitch Phillips <31459023+hctim@users.noreply.github.com>
Date: Mon, 21 Mar 2022 16:17:11 -0700
Subject: Revert "[OpaquePointers][BitcodeReader] Enable -opaque-pointers if we
 see an opaque pointer type"

This reverts commit 46216aa97729aa994dce79e75cd25707fb4b7874.

Dependency https://reviews.llvm.org/D119482 broke the ASan buildbot.
---
 llvm/lib/Bitcode/Reader/BitcodeReader.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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

diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
index 034fa58..afe18c5 100644
--- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -1883,9 +1883,7 @@ Error BitcodeReader::parseTypeTableBody() {
     case bitc::TYPE_CODE_OPAQUE_POINTER: { // OPAQUE_POINTER: [addrspace]
       if (Record.size() != 1)
         return error("Invalid opaque pointer record");
-      if (LLVM_UNLIKELY(!Context.hasSetOpaquePointersValue())) {
-        Context.enableOpaquePointers();
-      } else if (Context.supportsTypedPointers())
+      if (Context.supportsTypedPointers())
         return error(
             "Opaque pointers are only supported in -opaque-pointers mode");
       unsigned AddressSpace = Record[0];
-- 
cgit v1.1