Merge pull request #12526 from apple/verifier_fix
Merge pull request #12484 from shajrawi/relax_verify
diff --git a/lib/SIL/SILVerifier.cpp b/lib/SIL/SILVerifier.cpp
index 7d18d2e..3208ab3 100644
--- a/lib/SIL/SILVerifier.cpp
+++ b/lib/SIL/SILVerifier.cpp
@@ -2405,6 +2405,7 @@
if (!isConsumingOrMutatingApplyUse(use))
return true;
break;
+ case ValueKind::StructElementAddrInst:
case ValueKind::LoadInst:
case ValueKind::DebugValueAddrInst:
if (I->hasOneUse())
diff --git a/test/SILOptimizer/sil_combine1.swift b/test/SILOptimizer/sil_combine1.swift
new file mode 100644
index 0000000..0969f3f
--- /dev/null
+++ b/test/SILOptimizer/sil_combine1.swift
@@ -0,0 +1,37 @@
+// RUN: %target-swift-frontend %s -O -emit-sil | %FileCheck %s
+
+func curry<T1, T2, T3, T4>(_ f: @escaping (T1, T2, T3) -> T4) -> (T1) -> (T2) -> (T3) -> T4 {
+ return { x in { y in { z in f(x, y, z) } } }
+}
+
+public protocol P {
+ func val() -> Int32
+}
+
+struct CP: P {
+ let v: Int32
+
+ func val() -> Int32 {
+ return v
+ }
+
+ init(_ v: Int32) {
+ self.v = v
+ }
+}
+
+func compose(_ x: P, _ y: P, _ z: P) -> Int32 {
+ return x.val() + y.val() + z.val()
+}
+
+//CHECK-LABEL: sil [noinline] @_T012sil_combine120test_compose_closures5Int32VyF : $@convention(thin) () -> Int32 {
+//CHECK: [[OEADDR:%.*]] = open_existential_addr immutable_access {{%.*}} : $*P to $*@opened
+//CHECK: [[ADDRCAST:%.*]] = unchecked_addr_cast [[OEADDR]] : $*@opened
+//CHECK: struct_element_addr [[ADDRCAST]] : $*CP, #CP.v
+@inline(never)
+public func test_compose_closure() -> Int32 {
+ let insult = curry(compose)(CP(1))(CP(2))
+ let gs = insult(CP(3))
+ return gs
+}
+
