---

yaml
---
r: 340461
b: refs/heads/rxwei-patch-1
c: 8677068
h: refs/heads/master
i:
  340459: 3157449

Author: slavapestov

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: 198e8d1a1f8d780346b22b57cad56c38ea68ed66
+refs/heads/rxwei-patch-1: 8677068c5394de0b197b66b5c6f0a6cafb9c7260
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/include/swift/SIL/SILDebugScope.h

@@ -65,8 +65,10 @@ class SILDebugScope : public SILAllocated<SILDebugScope> {
   SILFunction *getParentFunction() const;
 
 #ifndef NDEBUG
-  void dump(SourceManager &SM, llvm::raw_ostream &OS = llvm::errs(),
-            unsigned Indent = 0) const;
+  LLVM_ATTRIBUTE_DEPRECATED(void dump(SourceManager &SM, llvm::raw_ostream &OS = llvm::errs(),
+                            unsigned Indent = 0) const,
+                  "only for use in the debugger");
+  LLVM_ATTRIBUTE_DEPRECATED(void dump(SILModule &Mod) const, "only for use in the debugger");
 #endif
 };
 

branches/rxwei-patch-1/lib/ClangImporter/ClangImporter.cpp

@@ -1746,7 +1746,7 @@ PlatformAvailability::PlatformAvailability(LangOptions &langOpts)
         "APIs deprecated as of macOS 10.9 and earlier are unavailable in Swift";
     break;
 
-  default:
+  case PlatformKind::none:
     break;
   }
 }
@@ -1787,7 +1787,11 @@ bool PlatformAvailability::treatDeprecatedAsUnavailable(
   Optional<unsigned> minor = version.getMinor();
 
   switch (platformKind) {
+  case PlatformKind::none:
+    llvm_unreachable("version but no platform?");
+
   case PlatformKind::OSX:
+  case PlatformKind::OSXApplicationExtension:
     // Anything deprecated in OSX 10.9.x and earlier is unavailable in Swift.
     return major < 10 ||
            (major == 10 && (!minor.hasValue() || minor.getValue() <= 9));
@@ -1803,10 +1807,9 @@ bool PlatformAvailability::treatDeprecatedAsUnavailable(
   case PlatformKind::watchOSApplicationExtension:
     // No deprecation filter on watchOS
     return false;
-
-  default:
-    return false;
   }
+
+  llvm_unreachable("Unexpected platform");
 }
 
 ClangImporter::Implementation::Implementation(ASTContext &ctx,

branches/rxwei-patch-1/lib/Parse/ParseExpr.cpp

@@ -1963,8 +1963,9 @@ ParserResult<Expr> Parser::parseExprStringLiteral() {
   unsigned QuoteLength;
   tok QuoteKind;
   std::tie(QuoteLength, QuoteKind) =
-      Tok.isMultilineString() ? std::make_tuple(3, tok::multiline_string_quote)
-                              : std::make_tuple(1, tok::string_quote);
+    Tok.isMultilineString() ? std::make_tuple(3, tok::multiline_string_quote)
+                            : std::make_tuple(1, Tok.getText().startswith("\'") ?
+                                          tok::single_quote: tok::string_quote);
   unsigned CloseQuoteBegin = Tok.getLength() - DelimiterLength - QuoteLength;
 
   OpenDelimiterStr = Tok.getRawText().take_front(DelimiterLength);

branches/rxwei-patch-1/lib/SIL/SILPrinter.cpp

@@ -3005,6 +3005,12 @@ void SILDebugScope::dump(SourceManager &SM, llvm::raw_ostream &OS,
   }
   OS << "}\n";
 }
+
+void SILDebugScope::dump(SILModule &Mod) const {
+  // We just use the default indent and llvm::errs().
+  dump(Mod.getASTContext().SourceMgr);
+}
+
 #endif
 
 void SILSpecializeAttr::print(llvm::raw_ostream &OS) const {

branches/rxwei-patch-1/lib/SILOptimizer/Mandatory/DIMemoryUseCollector.cpp

@@ -1568,11 +1568,15 @@ collectDelegatingInitUses(const DIMemoryObjectInfo &TheMemory,
     // be an end_borrow use in addition to the value_metatype.
     if (isa<LoadBorrowInst>(User)) {
       auto UserVal = cast<SingleValueInstruction>(User);
-      bool onlyUseIsValueMetatype = true;
+      bool onlyUseIsValueMetatype = false;
       for (auto use : UserVal->getUses()) {
-        if (isa<EndBorrowInst>(use->getUser())
-            || isa<ValueMetatypeInst>(use->getUser()))
+        auto *user = use->getUser();
+        if (isa<EndBorrowInst>(user))
           continue;
+        if (isa<ValueMetatypeInst>(user)) {
+          onlyUseIsValueMetatype = true;
+          continue;
+        }
         onlyUseIsValueMetatype = false;
         break;
       }

branches/rxwei-patch-1/lib/Sema/TypeCheckType.cpp

@@ -826,6 +826,13 @@ Type TypeChecker::applyUnboundGenericArguments(
 
     subs = parentType->getContextSubstitutions(decl->getDeclContext());
     skipRequirementsCheck |= parentType->hasTypeVariable();
+  } else if (auto genericEnv =
+                 decl->getDeclContext()->getGenericEnvironmentOfContext()) {
+    auto subMap = genericEnv->getForwardingSubstitutionMap();
+    for (auto gp : subMap.getGenericSignature()->getGenericParams()) {
+      subs[gp->getCanonicalType()->castTo<GenericTypeParamType>()] =
+        Type(gp).subst(subMap);
+    }
   }
 
   SourceLoc noteLoc = decl->getLoc();

branches/rxwei-patch-1/test/ClangImporter/availability_ios.swift

@@ -1,4 +1,5 @@
 // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -I %S/Inputs/custom-modules %s
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -I %S/Inputs/custom-modules -application-extension %s
 
 // REQUIRES: OS=ios
 

branches/rxwei-patch-1/test/ClangImporter/availability_macosx.swift

@@ -1,4 +1,5 @@
 // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -I %S/Inputs/custom-modules %s
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify -I %S/Inputs/custom-modules -application-extension %s
 
 // REQUIRES: OS=macosx
 

branches/rxwei-patch-1/test/SILOptimizer/definite_init_diagnostics.swift

@@ -1579,3 +1579,12 @@ class WeakCycle {
     self.d = 10
   }
 }
+
+// <rdar://51198592> DI was crashing as it wrongly detected a `type(of: self)`
+// use in a delegating initializer, when there was none.
+class DelegatingInitTest {
+  convenience init(x: Int) {
+    self // expected-warning {{expression of type 'DelegatingInitTest' is unused}}
+      // expected-error@-1 {{'self' used before 'self.init' call or assignment to 'self'}}
+  } // expected-error {{'self.init' isn't called on all paths before returning from initializer}}
+}

branches/rxwei-patch-1/test/SILOptimizer/definite_init_markuninitialized_delegatingself.sil

@@ -275,3 +275,20 @@ bb2:
   %7 = tuple ()
   return %7 : $()
 }
+
+// <rdar://51198592> DI was crashing as it wrongly detected a `type(of: self)`
+// use in a delegating initializer, when there was none.
+class MyClass4 {
+}
+
+sil hidden [ossa] @test_self_uninit_use_in_delegating_init : $@convention(method) (@thick MyClass4.Type) -> @owned MyClass4 {
+bb0(%1 : $@thick MyClass4.Type):
+  %2 = alloc_stack $MyClass4, let, name "self"
+  %3 = mark_uninitialized [delegatingself] %2 : $*MyClass4
+  %5 = load_borrow %3 : $*MyClass4 // expected-error {{'self' used before 'self.init' call or assignment to 'self'}}
+  end_borrow %5 : $MyClass4
+  %7 = load [copy] %3 : $*MyClass4 // expected-error {{'self.init' isn't called on all paths before returning from initializer}}
+  destroy_addr %3 : $*MyClass4
+  dealloc_stack %2 : $*MyClass4
+  return %7 : $MyClass4
+}

branches/rxwei-patch-1/test/Syntax/round_trip_fix_quote.swift

@@ -0,0 +1,7 @@
+// RUN: rm -rf %t
+// RUN: %swift-syntax-test -input-source-filename %s -parse-gen > %t
+// RUN: diff -u %s %t
+
+"abc"
+
+RoundedRectangle(cornerRadius: 6.0)lengthlength'Integer' field' [binding value: \(int.value)]int'Double' field [binding value: \(double.value)]double

branches/rxwei-patch-1/utils/api_checker/sdk-module-lists/infer-imports.py

@@ -3,7 +3,11 @@
 import os
 import sys
 
-blacklist = ["Kernel", "Ruby", "Tk"]
+blacklist = [
+    "Kernel", "Ruby", "Tk",
+    "DriverKit", "HIDDriverKit", "SkywalkDriverKit",  # has C++ code
+    "NetworkingDriverKit", "USBSerialDriverKit",  # has C++ code
+]
 
 
 def get_immediate_subdirectories(a_dir):
@@ -16,11 +20,19 @@ def get_frameworks(sdk_path):
     names = []
     for frame in os.listdir(frameworks_path):
         if frame.endswith(".framework"):
+            name = frame[:-len(".framework")]
             header_dir_path = frameworks_path + '/' + frame + '/Headers'
             module_dir_path = frameworks_path + '/' + frame + '/Modules'
+            swiftmodule_path = module_dir_path + '/' + name + '.swiftmodule'
             old_modulemap_path = frameworks_path + '/' + frame + '/module.map'
             old_modulemap_private_path = frameworks_path + '/' + frame + \
                 '/module_private.map'
+
+            if os.path.exists(swiftmodule_path):
+                if name not in blacklist:
+                    names.append(name)
+                continue
+
             if not os.path.exists(header_dir_path):
                 if os.path.exists(module_dir_path):
                     print >>sys.stderr, header_dir_path, \
@@ -36,7 +48,6 @@ def get_frameworks(sdk_path):
             if should_exclude_framework(frameworks_path + '/' + frame):
                 continue
 
-            name = frame[:-len(".framework")]
             if name in blacklist:
                 continue
             names.append(name)

branches/rxwei-patch-1/utils/gyb_syntax_support/Token.py

@@ -249,6 +249,8 @@ def macro_name(self):
 
     Punctuator('StringQuote', 'string_quote', text='\\\"',
                classification='StringLiteral', serialization_code=102),
+    Punctuator('SingleQuote', 'single_quote', text='\\\'',
+               classification='StringLiteral', serialization_code=120),
     Punctuator('MultilineStringQuote', 'multiline_string_quote',
                text='\\\"\\\"\\\"', classification='StringLiteral',
                serialization_code=103),

branches/rxwei-patch-1/validation-test/StdlibUnittest/CrashingTests.swift

@@ -19,8 +19,8 @@ TestSuiteCrashes.test("crashesUnexpectedly1") {
   print("crashesUnexpectedly1")
   fatalError("This should crash")
 }
-// CHECK: stdout>>> crashesUnexpectedly1
-// CHECK: stderr>>> Fatal error: This should crash:
+// CHECK-DAG: stdout>>> crashesUnexpectedly1
+// CHECK-DAG: stderr>>> Fatal error: This should crash:
 // CHECK: stderr>>> CRASHED: SIG
 // CHECK: [     FAIL ] TestSuiteCrashes.crashesUnexpectedly1
 

branches/rxwei-patch-1/validation-test/compiler_crashers_2_fixed/0196-sr9954.swift

@@ -0,0 +1,28 @@
+// RUN: %target-swift-frontend %s -emit-ir
+
+// SR-9954 / rdar://problem/48223824
+// Rejects well-formed that triggered a fallback diagnostic due to a bad
+// substitution.
+struct GenericThing <Param1, Param2> {
+    init (closure: (String)->()) {
+        
+    }
+}
+
+struct ThingHolder <Param1> {
+    func acceptThing <Param2> (thingGenerator: ()->GenericThing<Param1, Param2>) {
+
+    }
+}
+
+struct A { }
+
+func demo <Param1> (thingHolder: ThingHolder<Param1>) {
+    typealias Thing <Param2> = GenericThing<Param1, Param2>
+    thingHolder.acceptThing {
+        Thing<A> { string in
+
+        }
+    }
+}
+