Merge pull request #89917 from augusto2112/rev-enable-sil-verify-debug-value-type-chain

Author: augusto2112

lib/SIL/Verifier/SILVerifier.cpp

@@ -87,6 +87,11 @@ static llvm::cl::opt<bool> VerifyDIHoles("verify-di-holes", llvm::cl::init(
 #endif
                                                                 ));
 
+// Verify the type chain of debug_value instructions. Disabled by default
+// while we fix all root causes.
+static llvm::cl::opt<bool> VerifyDebugValueExpr("verify-debug-value-expr",
+                                                llvm::cl::init(false));
+
 static llvm::cl::opt<bool> SkipConvertEscapeToNoescapeAttributes(
     "verify-skip-convert-escape-to-noescape-attributes", llvm::cl::init(false));
 
@@ -1959,7 +1964,9 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
     }
 
     // Type chain: SSA operand -> DebugBB -> deref -> fragments -> vartype
-    require(inst->isExprTypeValid(), "debug_value type chain should hold");
+    if (VerifyDebugValueExpr)
+      require(inst->isExprTypeValid(),
+              "debug_value type chain should hold");
   }
 
   void checkInstructionsDebugInfo(SILInstruction *inst) {

test/Concurrency/silisolationinfo_inference.sil

@@ -1356,7 +1356,7 @@ bb0(%0 : @guaranteed $MainActorIsolatedStruct):
 sil [ossa] @test_nonisolated_unsafe_field_override_struct_addr : $@convention(thin) (@in_guaranteed MainActorIsolatedStruct) -> () {
 bb0(%0 : $*MainActorIsolatedStruct):
   specify_test "sil_isolation_info_inference @trace[0]"
-  debug_value %0 : $*MainActorIsolatedStruct, let, name "self", expr op_deref
+  debug_value %0 : $*MainActorIsolatedStruct, let, name "self"
   %1 = struct_element_addr %0 : $*MainActorIsolatedStruct, #MainActorIsolatedStruct.nsNonisolatedUnsafe
   debug_value [trace] %1
   %9999 = tuple ()
@@ -1370,7 +1370,7 @@ bb0(%0 : $*MainActorIsolatedStruct):
 sil [ossa] @test_nonisolated_unsafe_field_override_generic_struct_addr : $@convention(thin) <T> (@in_guaranteed MainActorIsolatedGenericStruct<T>) -> () {
 bb0(%0 : $*MainActorIsolatedGenericStruct<T>):
   specify_test "sil_isolation_info_inference @trace[0]"
-  debug_value %0 : $*MainActorIsolatedGenericStruct<T>, let, name "self", expr op_deref
+  debug_value %0 : $*MainActorIsolatedGenericStruct<T>, let, name "self"
   %1 = struct_element_addr %0 : $*MainActorIsolatedGenericStruct<T>, #MainActorIsolatedGenericStruct.nsNonisolatedUnsafe
   debug_value [trace] %1
   %9999 = tuple ()
@@ -1384,7 +1384,7 @@ bb0(%0 : $*MainActorIsolatedGenericStruct<T>):
 sil [ossa] @test_nonisolated_unsafe_field_override_nonisolated_generic_struct_addr : $@convention(thin) <T> (@in_guaranteed NonisolatedGenericStruct<T>) -> () {
 bb0(%0 : $*NonisolatedGenericStruct<T>):
   specify_test "sil_isolation_info_inference @trace[0]"
-  debug_value %0 : $*NonisolatedGenericStruct<T>, let, name "self", expr op_deref
+  debug_value %0 : $*NonisolatedGenericStruct<T>, let, name "self"
   %1 = struct_element_addr %0 : $*NonisolatedGenericStruct<T>, #NonisolatedGenericStruct.nsNonisolatedUnsafe
   debug_value [trace] %1
   %9999 = tuple ()

test/DebugInfo/irgen_box_debug_value.sil

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -disable-debugger-shadow-copies -g -emit-irgen %s | %FileCheck %s
+// RUN: %target-swift-frontend -Xllvm -verify-debug-value-expr -disable-debugger-shadow-copies -g -emit-irgen %s | %FileCheck %s
 sil_stage canonical
 
 import Swift

test/SIL/Parser/debug_transform_block.sil

@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt -sil-print-types %s | %FileCheck %s
+// RUN: %target-sil-opt -sil-print-types -verify-debug-value-expr %s | %FileCheck %s
 sil_stage canonical
 
 import Builtin

test/SIL/verifier_failures_debug_transform.sil

@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt -sil-print-types -verify-continue-on-failure -o /dev/null %s 2>&1 | %FileCheck %s
+// RUN: %target-sil-opt -sil-print-types -verify-debug-value-expr -verify-continue-on-failure -o /dev/null %s 2>&1 | %FileCheck %s
 
 // REQUIRES: asserts
 

test/SILOptimizer/mark_weak_var_as_sendable.sil

@@ -382,7 +382,7 @@ bb0(%arg : @owned $C):
 // CHECK: } // end sil function 'chained_callee'
 sil [ossa] @chained_callee : $@convention(thin) (@guaranteed { var @sil_weak Optional<C> }) -> () {
 bb0(%0 : @closureCapture @guaranteed ${ var @sil_weak Optional<C> }):
-  debug_value %0, var, name "c", argno 1
+  debug_value %0, var, name "c", argno 1, expr op_deref
   %2 = function_ref @simple_callee : $@convention(thin) (@guaranteed { var @sil_weak Optional<C> }) -> ()
   %1 = copy_value %0
   %3 = partial_apply [callee_guaranteed] %2(%1) : $@convention(thin) (@guaranteed { var @sil_weak Optional<C> }) -> ()

test/SILOptimizer/moveonly_type_eliminator.sil

@@ -613,7 +613,7 @@ sil [ossa] @existential_metatype : $@convention(thin) (@guaranteed any Error) ->
 bb0(%x : @guaranteed $any Error):
   %y = copyable_to_moveonlywrapper [guaranteed] %x : $any Error
   %em = existential_metatype $@thick any Error.Type, %y : $@moveOnly (any Error)
-  debug_value %em : $@thick any Error.Type, var, name "s", argno 1
+  debug_value %em : $@thick any Error.Type, var, name "s", argno 1, expr op_deref
   return %em : $@thick any Error.Type
 }