[PATCH] D104902: [OpaquePtr] Allow globals with opaque pointer value type

[Nikita Popov via Phabricator via llvm-commits]

This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG1e6303e60ca5: [OpaquePtr] Allow globals with opaque pointer value type (authored by nikic).

Changed prior to commit:
  https://reviews.llvm.org/D104902?vs=354453&id=354527#toc

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D104902/new/

https://reviews.llvm.org/D104902

Files:
  llvm/lib/IR/Type.cpp
  llvm/test/Assembler/invalid-opaque-ptr.ll
  llvm/test/Assembler/opaque-ptr.ll


Index: llvm/test/Assembler/opaque-ptr.ll
===================================================================
--- llvm/test/Assembler/opaque-ptr.ll
+++ llvm/test/Assembler/opaque-ptr.ll
@@ -1,6 +1,9 @@
 ; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | FileCheck %s
 ; RUN: verify-uselistorder %s
 
+; CHECK: @global = external global ptr
+ at global = external global ptr
+
 ; CHECK: define ptr @f(ptr %a) {
 ; CHECK:     %b = bitcast ptr %a to ptr
 ; CHECK:     ret ptr %b
Index: llvm/test/Assembler/invalid-opaque-ptr.ll
===================================================================
--- llvm/test/Assembler/invalid-opaque-ptr.ll
+++ /dev/null
@@ -1,7 +0,0 @@
-; RUN: not llvm-as < %s -disable-output 2>&1 | FileCheck %s
-
-; CHECK: pointer to this type is invalid
-define void @f(ptr %a) {
-    %b = bitcast ptr %a to ptr*
-    ret void
-}
Index: llvm/lib/IR/Type.cpp
===================================================================
--- llvm/lib/IR/Type.cpp
+++ llvm/lib/IR/Type.cpp
@@ -690,7 +690,9 @@
 
   LLVMContextImpl *CImpl = EltTy->getContext().pImpl;
 
-  if (CImpl->ForceOpaquePointers)
+  // Create opaque pointer for pointer to opaque pointer.
+  if (CImpl->ForceOpaquePointers ||
+      (isa<PointerType>(EltTy) && cast<PointerType>(EltTy)->isOpaque()))
     return get(EltTy->getContext(), AddressSpace);
 
   // Since AddressSpace #0 is the common case, we special case it.
@@ -729,19 +731,13 @@
 }
 
 PointerType *Type::getPointerTo(unsigned AddrSpace) const {
-  // Pointer to opaque pointer is opaque pointer.
-  if (auto *PTy = dyn_cast<PointerType>(this))
-    if (PTy->isOpaque())
-      return PointerType::get(getContext(), AddrSpace);
-
   return PointerType::get(const_cast<Type*>(this), AddrSpace);
 }
 
 bool PointerType::isValidElementType(Type *ElemTy) {
   return !ElemTy->isVoidTy() && !ElemTy->isLabelTy() &&
          !ElemTy->isMetadataTy() && !ElemTy->isTokenTy() &&
-         !ElemTy->isX86_AMXTy() &&
-         !(ElemTy->isPointerTy() && cast<PointerType>(ElemTy)->isOpaque());
+         !ElemTy->isX86_AMXTy();
 }
 
 bool PointerType::isLoadableOrStorableType(Type *ElemTy) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D104902.354527.patch
Type: text/x-patch
Size: 2126 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210625/e02183ba/attachment.bin>