From 10ffe80a24b042473cb4988861c45ab7b15f1f21 Mon Sep 17 00:00:00 2001 From: Arthur Eubanks Date: Mon, 21 Mar 2022 17:11:14 -0700 Subject: Revert "Revert "[OpaquePointers][BitcodeReader] Enable -opaque-pointers if we see an opaque pointer type"" This reverts commit 80ec0ebfdc5692a58e0832125f2c6a991df9d63f. Issues were already fixed at head. --- llvm/lib/Bitcode/Reader/BitcodeReader.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (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 afe18c5..034fa58 100644 --- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp @@ -1883,7 +1883,9 @@ Error BitcodeReader::parseTypeTableBody() { case bitc::TYPE_CODE_OPAQUE_POINTER: { // OPAQUE_POINTER: [addrspace] if (Record.size() != 1) return error("Invalid opaque pointer record"); - if (Context.supportsTypedPointers()) + if (LLVM_UNLIKELY(!Context.hasSetOpaquePointersValue())) { + Context.enableOpaquePointers(); + } else if (Context.supportsTypedPointers()) return error( "Opaque pointers are only supported in -opaque-pointers mode"); unsigned AddressSpace = Record[0]; -- cgit v1.1