Merge pull request #1449 from swiftwasm/master

pull[bot] · web-flow · commit 3819961c4038 · 2020-07-14T04:38:32.000Z
[pull] swiftwasm from master
diff --git a/include/swift/SIL/MemAccessUtils.h b/include/swift/SIL/MemAccessUtils.h
@@ -50,8 +50,7 @@
 
 namespace swift {
 
-/// Get the base address of a formal access by stripping access markers and
-/// borrows.
+/// Get the base address of a formal access by stripping access markers.
 ///
 /// If \p v is an address, then the returned value is also an address
 /// (pointer-to-address is not stripped).
diff --git a/lib/SIL/Utils/InstructionUtils.cpp b/lib/SIL/Utils/InstructionUtils.cpp
@@ -127,9 +127,10 @@ SILValue swift::stripCastsWithoutMarkDependence(SILValue V) {
     V = stripSinglePredecessorArgs(V);
 
     auto K = V->getKind();
-    if (isRCIdentityPreservingCast(K) ||
-        K == ValueKind::UncheckedTrivialBitCastInst ||
-        K == ValueKind::EndCOWMutationInst) {
+    if (isRCIdentityPreservingCast(K)
+        || K == ValueKind::UncheckedTrivialBitCastInst
+        || K == ValueKind::BeginAccessInst
+        || K == ValueKind::EndCOWMutationInst) {
       V = cast<SingleValueInstruction>(V)->getOperand(0);
       continue;
     }
@@ -145,7 +146,8 @@ SILValue swift::stripCasts(SILValue v) {
     auto k = v->getKind();
     if (isRCIdentityPreservingCast(k)
         || k == ValueKind::UncheckedTrivialBitCastInst
-        || k == ValueKind::MarkDependenceInst) {
+        || k == ValueKind::MarkDependenceInst
+        || k == ValueKind::BeginAccessInst) {
       v = cast<SingleValueInstruction>(v)->getOperand(0);
       continue;
     }
diff --git a/lib/SIL/Utils/Projection.cpp b/lib/SIL/Utils/Projection.cpp
@@ -371,8 +371,13 @@ Optional<ProjectionPath> ProjectionPath::getProjectionPath(SILValue Start,
 
   auto Iter = End;
   while (Start != Iter) {
-    // end_cow_mutation is not a projection, but we want to "see through" it.
-    if (!isa<EndCOWMutationInst>(Iter)) {
+    // end_cow_mutation and begin_access are not projections, but we need to be
+    // able to form valid ProjectionPaths across them, otherwise optimization
+    // passes like RLE/DSE cannot recognize their locations.
+    //
+    // TODO: migrate users to getProjectionPath to the AccessPath utility to
+    // avoid this hack.
+    if (!isa<EndCOWMutationInst>(Iter) && !isa<BeginAccessInst>(Iter)) {
       Projection AP(Iter);
       if (!AP.isValid())
         break;
diff --git a/lib/Sema/CSBindings.cpp b/lib/Sema/CSBindings.cpp
@@ -547,13 +547,28 @@ ConstraintSystem::getPotentialBindings(TypeVariableType *typeVar) const {
       }
       break;
     }
+    case ConstraintKind::KeyPathApplication: {
+      if (result.FullyBound)
+        continue;
+
+      // If this variable is in the application projected result type, mark the
+      // result as `FullyBound` to ensure we delay binding until we've bound
+      // other type variables in the KeyPathApplication constraint. This ensures
+      // we try to bind the key path type first, which can allow us to discover
+      // additional bindings for the result type.
+      SmallPtrSet<TypeVariableType *, 4> typeVars;
+      findInferableTypeVars(simplifyType(constraint->getThirdType()), typeVars);
+      if (typeVars.count(typeVar))
+        result.FullyBound = true;
+
+      break;
+    }
 
     case ConstraintKind::BridgingConversion:
     case ConstraintKind::CheckedCast:
     case ConstraintKind::EscapableFunctionOf:
     case ConstraintKind::OpenedExistentialOf:
     case ConstraintKind::KeyPath:
-    case ConstraintKind::KeyPathApplication:
     case ConstraintKind::FunctionInput:
     case ConstraintKind::FunctionResult:
     case ConstraintKind::OpaqueUnderlyingType:
diff --git a/stdlib/public/stubs/Stubs.cpp b/stdlib/public/stubs/Stubs.cpp
@@ -337,7 +337,11 @@ swift_stdlib_readLine_stdin(unsigned char **LinePtr) {
   return Pos;
 #else
   size_t Capacity = 0;
-  return getline((char **)LinePtr, &Capacity, stdin);
+  int result;
+  do {
+    result = getline((char **)LinePtr, &Capacity, stdin);
+  } while (result < 0 && errno == EINTR);
+  return result;
 #endif
 }
 
diff --git a/test/Constraints/keypath.swift b/test/Constraints/keypath.swift
@@ -137,3 +137,18 @@ func test_mismatch_with_contextual_optional_result() {
   let _ = A(B(), keyPath: \.arr)
   // expected-error@-1 {{key path value type '[Int]' cannot be converted to contextual type '[Int]?'}}
 }
+
+// SR-11184
+class SR11184 {}
+
+func fSR11184(_ c: SR11184!, _ kp: ReferenceWritableKeyPath<SR11184, String?>, _ str: String) {
+  c[keyPath: kp] = str // OK
+  c![keyPath: kp] = str // OK
+  c?[keyPath: kp] = str // OK
+}
+
+func fSR11184_O(_ c: SR11184!, _ kp: ReferenceWritableKeyPath<SR11184, String?>, _ str: String?) {
+  c[keyPath: kp] = str // OK
+  c![keyPath: kp] = str // OK
+  c?[keyPath: kp] = str // OK
+}
diff --git a/test/Prototypes/BigInt.swift b/test/Prototypes/BigInt.swift
@@ -16,6 +16,7 @@
 // REQUIRES: executable_test
 // REQUIRES: CPU=x86_64
 
+// REQUIRES: rdar65251059
 // rdar://problem/65015626
 // XFAIL: asserts
 
diff --git a/test/SILGen/magic_identifier_file_conflicting.swift.gyb b/test/SILGen/magic_identifier_file_conflicting.swift.gyb
@@ -1,6 +1,6 @@
 // RUN: %empty-directory(%t)
 // RUN: %gyb -D TEMPDIR=%t %s > %t/magic_identifier_file_conflicting.swift
-// RUN: %{python} -c "import sys; t = open(sys.argv[1], 'rb').read().replace('\r\n', '\n'); open(sys.argv[1], 'wb').write(t)" %t/magic_identifier_file_conflicting.swift
+// RUN: %{python} -c "import io; import sys; t = io.open(sys.argv[1], 'r', encoding='utf-8').read().replace('\r\n', '\n'); io.open(sys.argv[1], 'w', encoding='utf-8', newline='\n').write(t)" %t/magic_identifier_file_conflicting.swift
 
 // We want to check both the diagnostics and the SIL output.
 // RUN: %target-swift-emit-silgen -verify -emit-sorted-sil -enable-experimental-concise-pound-file -module-name Foo %t/magic_identifier_file_conflicting.swift %S/Inputs/magic_identifier_file_conflicting_other.swift | %FileCheck %s
diff --git a/test/SILOptimizer/escape_analysis.sil b/test/SILOptimizer/escape_analysis.sil
@@ -1938,7 +1938,7 @@ bb0(%0 : $*SomeData):
 // CHECK:  to   set_deallocating %0 : $IntWrapper
 // CHECK: NoEscape:   %3 = ref_element_addr %0 : $IntWrapper, #IntWrapper.property
 // CHECK:  to   set_deallocating %0 : $IntWrapper
-// CHECK: MayEscape:   %4 = begin_access [modify] [dynamic] [no_nested_conflict] %3 : $*Int64
+// CHECK: NoEscape:   %4 = begin_access [modify] [dynamic] [no_nested_conflict] %3 : $*Int64
 // CHECK:  to   set_deallocating %0 : $IntWrapper
 sil @testEndAccess : $@convention(thin) () -> () {
 bb0:
diff --git a/test/SPI/private_swiftinterface.swift b/test/SPI/private_swiftinterface.swift
@@ -93,8 +93,7 @@ private class PrivateClassLocal {}
 // CHECK-PUBLIC-NOT: SPIProto3
 
   associatedtype AssociatedType
-  // CHECK-PRIVATE: associatedtype AssociatedType
-  // CHECK-PRIVATE-NOT: @_spi(LocalSPI) associatedtype AssociatedType
+  // CHECK-PRIVATE: {{^}}  associatedtype AssociatedType
   // CHECK-PUBLIC-NOT: AssociatedType
 
   func implicitSPIMethod()
diff --git a/test/stdlib/Integers.swift.gyb b/test/stdlib/Integers.swift.gyb
@@ -19,7 +19,8 @@
 // REQUIRES: OS=macosx
 
 %{
-word_bits = int(WORD_BITS) / 2
+from __future__ import division
+word_bits = int(WORD_BITS) // 2
 from SwiftIntTypes import all_integer_types
 }%
 
diff --git a/utils/apply-fixit-edits.py b/utils/apply-fixit-edits.py
@@ -46,7 +46,7 @@ def apply_edits(path):
             text = ed.get("text", "")
             edits_per_file[fname].append((offset, length, text))
 
-    for fname, edits in edits_per_file.iteritems():
+    for fname, edits in edits_per_file.items():
         print('Updating', fname)
         edits.sort(reverse=True)
         with open(fname) as f:
diff --git a/utils/scale-test b/utils/scale-test
@@ -62,7 +62,7 @@ def write_input_file(args, ast, d, n):
 
 def ensure_tmpdir(d):
     if d is not None and not os.path.exists(d):
-        os.makedirs(d, 0700)
+        os.makedirs(d, 0o700)
     return tempfile.mkdtemp(dir=d)
 
 
@@ -74,7 +74,7 @@ def supports_stats_output_dir(args):
     sd = os.path.join(d, "stats-probe")
 
     try:
-        os.makedirs(sd, 0700)
+        os.makedirs(sd, 0o700)
         # Write a trivial test program and try running with
         # -stats-output-dir
         testpath = os.path.join(sd, "test.swift")
