Merge pull request #66077 from aschwaighofer/wip_enable_opaque_pointers

Enable usage of LLVM's opaque pointer

Author: aschwaighofer

lib/ClangImporter/ClangImporter.cpp

@@ -845,7 +845,7 @@ importer::addCommonInvocationArguments(
   invocationArgStrs.push_back("-fansi-escape-codes");
 
   invocationArgStrs.push_back("-Xclang");
-  invocationArgStrs.push_back("-no-opaque-pointers");
+  invocationArgStrs.push_back("-opaque-pointers");
 
   if (importerOpts.ValidateModulesOnce) {
     invocationArgStrs.push_back("-fmodules-validate-once-per-build-session");

lib/IRGen/GenDecl.cpp

@@ -5190,7 +5190,8 @@ IRGenModule::getAddrOfTypeMetadata(CanType concreteType,
   }
 
   if (auto *GV = dyn_cast<llvm::GlobalVariable>(addr.getValue()))
-    GV->setComdat(nullptr);
+    if (GV->isDeclaration())
+      GV->setComdat(nullptr);
 
   // FIXME: MC breaks when emitting alias references on some platforms
   // (rdar://problem/22450593 ). Work around this by referring to the aliasee

lib/IRGen/IRGenDebugInfo.cpp

@@ -2817,6 +2817,7 @@ void IRGenDebugInfoImpl::emitDbgIntrinsic(
     llvm::DIExpression *Expr, unsigned Line, unsigned Col,
     llvm::DILocalScope *Scope, const SILDebugScope *DS, bool InCoroContext,
     AddrDbgInstrKind AddrDInstKind) {
+  Storage = Storage->stripPointerCasts();
   // Set the location/scope of the intrinsic.
   auto *InlinedAt = createInlinedAt(DS);
   auto DL =

lib/IRGen/IRGenSIL.cpp

@@ -981,17 +981,24 @@ class IRGenSILFunction :
       && !isAnonymous;
   }
 
-  bool shouldShadowStorage(llvm::Value *Storage) {
-    return !isa<llvm::AllocaInst>(Storage)
-      && !isa<llvm::UndefValue>(Storage)
-      && needsShadowCopy(Storage);
+  bool shouldShadowStorage(llvm::Value *Storage,
+                           llvm::Type *StorageType) {
+    Storage = Storage->stripPointerCasts();
+    if (isa<llvm::UndefValue>(Storage))
+        return false;
+    if (auto *Alloca = dyn_cast<llvm::AllocaInst>(Storage);
+        Alloca && Alloca->isStaticAlloca() &&
+        Alloca->getAllocatedType() == StorageType)
+      return false;
+    return needsShadowCopy(Storage);
   }
 
   /// At -Onone, emit a shadow copy of an Address in an alloca, so the
   /// register allocator doesn't elide the dbg.value intrinsic when
   /// register pressure is high.  There is a trade-off to this: With
   /// shadow copies, we lose the precise lifetime.
   llvm::Value *emitShadowCopyIfNeeded(llvm::Value *Storage,
+                                      llvm::Type *StorageType,
                                       const SILDebugScope *Scope,
                                       SILDebugVariable VarInfo,
                                       bool IsAnonymous, bool WasMoved,
@@ -1011,7 +1018,7 @@ class IRGenSILFunction :
     // This condition must be consistent with emitPoisonDebugValueInst to avoid
     // generating extra shadow copies for debug_value [poison].
     if (!shouldShadowVariable(VarInfo, IsAnonymous)
-        || !shouldShadowStorage(Storage)) {
+        || !shouldShadowStorage(Storage, StorageType)) {
       return Storage;
     }
 
@@ -1034,11 +1041,12 @@ class IRGenSILFunction :
   /// Like \c emitShadowCopyIfNeeded() but takes an \c Address instead of an
   /// \c llvm::Value.
   llvm::Value *emitShadowCopyIfNeeded(Address Storage,
+                                      llvm::Type *StorageType,
                                       const SILDebugScope *Scope,
                                       SILDebugVariable VarInfo,
                                       bool IsAnonymous, bool WasMoved) {
-    return emitShadowCopyIfNeeded(Storage.getAddress(), Scope, VarInfo,
-                                  IsAnonymous, WasMoved,
+    return emitShadowCopyIfNeeded(Storage.getAddress(), StorageType, Scope,
+                                  VarInfo, IsAnonymous, WasMoved,
                                   Storage.getAlignment());
   }
 
@@ -1072,7 +1080,9 @@ class IRGenSILFunction :
       return;
 
     if (e.size() == 1) {
-      copy.push_back(emitShadowCopyIfNeeded(e.claimNext(), Scope, VarInfo,
+      auto &ti = getTypeInfo(SILVal->getType());
+      copy.push_back(emitShadowCopyIfNeeded(e.claimNext(), ti.getStorageType(),
+                                            Scope, VarInfo,
                                             IsAnonymous, WasMoved));
       return;
     }
@@ -1116,7 +1126,7 @@ class IRGenSILFunction :
     llvm::raw_svector_ostream(Buf) << "$pack_count_" << Position;
     auto Name = IGM.Context.getIdentifier(Buf.str());
     SILDebugVariable Var(Name.str(), true, 0);
-    Shape = emitShadowCopyIfNeeded(Shape, getDebugScope(), Var, false,
+    Shape = emitShadowCopyIfNeeded(Shape, nullptr, getDebugScope(), Var, false,
                                    false /*was move*/);
     if (IGM.DebugInfo)
       IGM.DebugInfo->emitPackCountParameter(*this, Shape, Var);
@@ -5061,7 +5071,7 @@ void IRGenSILFunction::emitErrorResultVar(CanSILFunctionType FnTy,
   auto Var = DbgValue->getVarInfo();
   assert(Var && "error result without debug info");
   auto Storage =
-      emitShadowCopyIfNeeded(ErrorResultSlot.getAddress(), getDebugScope(),
+      emitShadowCopyIfNeeded(ErrorResultSlot.getAddress(), nullptr, getDebugScope(),
                              *Var, false, false /*was move*/);
   if (!IGM.DebugInfo)
     return;
@@ -5108,7 +5118,7 @@ void IRGenSILFunction::emitPoisonDebugValueInst(DebugValueInst *i) {
   // copy--poison should never affect program behavior. Also filter everything
   // not handled by emitShadowCopyIfNeeded to avoid extra shadow copies.
   if (!shouldShadowVariable(*varInfo, isAnonymous)
-      || !shouldShadowStorage(storage)) {
+      || !shouldShadowStorage(storage, nullptr)) {
     return;
   }
 
@@ -5255,13 +5265,15 @@ void IRGenSILFunction::visitDebugValueInst(DebugValueInst *i) {
 
   // Put the value into a shadow-copy stack slot at -Onone.
   llvm::SmallVector<llvm::Value *, 8> Copy;
-  if (IsAddrVal)
+  if (IsAddrVal) {
+    auto &ti = getTypeInfo(SILVal->getType());
     Copy.emplace_back(emitShadowCopyIfNeeded(
-        getLoweredAddress(SILVal).getAddress(), i->getDebugScope(), *VarInfo,
+        getLoweredAddress(SILVal).getAddress(), ti.getStorageType(), i->getDebugScope(), *VarInfo,
         IsAnonymous, i->getUsesMoveableValueDebugInfo()));
-  else
+  } else {
     emitShadowCopyIfNeeded(SILVal, i->getDebugScope(), *VarInfo, IsAnonymous,
                            i->getUsesMoveableValueDebugInfo(), Copy);
+  }
 
   bindArchetypes(DbgTy.getType());
   if (!IGM.DebugInfo)
@@ -5882,9 +5894,10 @@ void IRGenSILFunction::visitAllocBoxInst(swift::AllocBoxInst *i) {
   auto VarInfo = i->getVarInfo();
   if (!VarInfo)
     return;
-
+  auto &ti = getTypeInfo(SILTy);
   auto Storage =
-      emitShadowCopyIfNeeded(boxWithAddr.getAddress(), i->getDebugScope(),
+      emitShadowCopyIfNeeded(boxWithAddr.getAddress(), ti.getStorageType(),
+                             i->getDebugScope(),
                              *VarInfo, IsAnonymous, false /*was moved*/);
 
   if (!IGM.DebugInfo)

stdlib/cmake/modules/AddSwiftStdlib.cmake

@@ -138,8 +138,8 @@ function(_add_target_variant_c_compile_link_flags)
   if (_lto_flag_out)
     list(APPEND result "${_lto_flag_out}")
     # Disable opaque pointers in lto mode.
-    list(APPEND result "-Xclang")
-    list(APPEND result "-no-opaque-pointers")
+    #list(APPEND result "-Xclang")
+    #list(APPEND result "-no-opaque-pointers")
   endif()
 
   set("${CFLAGS_RESULT_VAR_NAME}" "${result}" PARENT_SCOPE)

test/AutoDiff/IRGen/differentiable_function.sil

@@ -1,4 +1,5 @@
-// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s
+// RUN: %target-swift-frontend %use_no_opaque_pointers -emit-ir %s | %FileCheck %s
+// RUN: %target-swift-frontend -emit-ir %s
 
 sil_stage raw
 

test/AutoDiff/IRGen/runtime.swift

@@ -1,4 +1,5 @@
-// RUN: %target-swift-frontend -parse-stdlib %s -emit-ir | %FileCheck %s
+// RUN: %target-swift-frontend %use_no_opaque_pointers -parse-stdlib %s -emit-ir | %FileCheck %s
+// RUN: %target-swift-frontend -parse-stdlib %s -emit-ir
 
 import Swift
 import _Differentiation

test/AutoDiff/IRGen/witness_table_differentiable_requirements.sil

@@ -1,4 +1,5 @@
-// RUN: %target-swift-frontend -parse-sil %s -emit-ir | %FileCheck %s
+// RUN: %target-swift-frontend %use_no_opaque_pointers -parse-sil %s -emit-ir | %FileCheck %s
+// RUN: %target-swift-frontend -parse-sil %s -emit-ir
 // REQUIRES: CPU=x86_64
 
 sil_stage canonical

test/AutoDiff/SIL/differentiability_witness_function_inst.sil

@@ -15,7 +15,8 @@
 
 // IRGen test.
 
-// RUN: %target-swift-frontend -Xllvm -sil-disable-pass=Simplification -emit-ir %s | %FileCheck %s --check-prefix=IRGEN --check-prefix %target-cpu
+// RUN: %target-swift-frontend %use_no_opaque_pointers -Xllvm -sil-disable-pass=Simplification -emit-ir %s | %FileCheck %s --check-prefix=IRGEN --check-prefix %target-cpu
+// RUN: %target-swift-frontend -Xllvm -sil-disable-pass=Simplification -emit-ir %s
 // NOTE: `%target-cpu`-specific FileCheck lines exist because lowered function types in LLVM IR differ between architectures.
 
 // `shell` is required only to run `sed` as a

test/AutoDiff/SIL/differentiable_function_inst.sil

@@ -15,7 +15,8 @@
 
 // IRGen test.
 
-// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s --check-prefix=CHECK-IRGEN
+// RUN: %target-swift-frontend %use_no_opaque_pointers -emit-ir %s | %FileCheck %s --check-prefix=CHECK-IRGEN
+// RUN: %target-swift-frontend -emit-ir %s
 
 // `shell` is required only to run `sed` as a
 // https://github.com/apple/swift/issues/54526 workaround.