diff --git a/llvm/lib/IR/Type.cpp b/llvm/lib/IR/Type.cpp
--- a/llvm/lib/IR/Type.cpp
+++ b/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) {
diff --git a/llvm/test/Assembler/invalid-opaque-ptr.ll b/llvm/test/Assembler/invalid-opaque-ptr.ll
deleted file mode 100644
--- a/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
-}
diff --git a/llvm/test/Assembler/opaque-ptr.ll b/llvm/test/Assembler/opaque-ptr.ll
--- a/llvm/test/Assembler/opaque-ptr.ll
+++ b/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
+@global = external global ptr
+
 ; CHECK: define ptr @f(ptr %a) {
 ; CHECK:     %b = bitcast ptr %a to ptr
 ; CHECK:     ret ptr %b