---

yaml
---
r: 341471
b: refs/heads/rxwei-patch-1
c: 0477878
h: refs/heads/master
i:
  341469: 3d0fa0e
  341467: 03a570c
  341463: ee2e495
  341455: 95e6b73
  341439: df109e1

Author: gottesmm

[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: a84972b816d890a1c2d1ba996688feed88730fe5
+refs/heads/rxwei-patch-1: 0477878b093be9ab959f6d452ae19aadcb4dd4c3
 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/Basic/LangOptions.h

@@ -314,6 +314,9 @@ namespace swift {
     /// and faster rebuilds.
     bool EnableExperimentalDependencies = false;
 
+    /// Enable the experimental opaque result types feature.
+    bool EnableOpaqueResultTypes = true;
+    
     /// To mimic existing system, set to false.
     /// To experiment with including file-private and private dependency info,
     /// set to true.

branches/rxwei-patch-1/include/swift/Option/FrontendOptions.td

@@ -413,6 +413,10 @@ def solver_enable_operator_designated_types :
   Flag<["-"], "solver-enable-operator-designated-types">,
   HelpText<"Enable operator designated types in constraint solver">;
 
+def enable_opaque_result_types :
+  Flag<["-"], "enable-opaque-result-types">,
+  HelpText<"Enable experimental opaque result types feature">;
+
 def switch_checking_invocation_threshold_EQ : Joined<["-"],
     "switch-checking-invocation-threshold=">;
 

branches/rxwei-patch-1/lib/Frontend/CompilerInvocation.cpp

@@ -276,6 +276,9 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
   Opts.EnableOperatorDesignatedTypes |=
       Args.hasArg(OPT_enable_operator_designated_types);
 
+  Opts.EnableOpaqueResultTypes |=
+      Args.hasArg(OPT_enable_opaque_result_types);
+
   // Always enable operator designated types for the standard library.
   Opts.EnableOperatorDesignatedTypes |= FrontendOpts.ParseStdlib;
 

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

@@ -697,7 +697,9 @@ Parser::parseTypeSimpleOrComposition(Diag<> MessageID,
   // This is only semantically allowed in certain contexts, but we parse it
   // generally for diagnostics and recovery.
   SourceLoc opaqueLoc;
-  if (Tok.is(tok::identifier) && Tok.getRawText() == "some") {
+  if (Context.LangOpts.EnableOpaqueResultTypes
+      && Tok.is(tok::identifier)
+      && Tok.getRawText() == "some") {
     // Treat some as a keyword.
     TokReceiver->registerTokenKindChange(Tok.getLoc(), tok::contextual_keyword);
     opaqueLoc = consumeToken();
@@ -763,7 +765,9 @@ Parser::parseTypeSimpleOrComposition(Diag<> MessageID,
     }
 
     // Diagnose invalid `some` after an ampersand.
-    if (Tok.is(tok::identifier) && Tok.getRawText() == "some") {
+    if (Context.LangOpts.EnableOpaqueResultTypes
+        && Tok.is(tok::identifier)
+        && Tok.getRawText() == "some") {
       auto badLoc = consumeToken();
 
       // TODO: Fixit to move to beginning of composition.

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

@@ -16,16 +16,7 @@
 using namespace swift;
 
 static ValueOwnershipKind getOwnershipKindForUndef(SILType type, const SILFunction &f) {
-  if (type.isAddress()) {
-    // If we have an address only type and we are supposed to use
-    // lowered addresses, return Owned. Otherwise addresses are any.
-    if (type.isAddressOnly(f) && f.getConventions().useLoweredAddresses()) {
-      return ValueOwnershipKind::Owned;
-    }
-    return ValueOwnershipKind::Any;
-  }
-
-  if (type.isTrivial(f))
+  if (type.isAddress() || type.isTrivial(f))
     return ValueOwnershipKind::Any;
   return ValueOwnershipKind::Owned;
 }

branches/rxwei-patch-1/test/Constraints/function_builder_diags.swift

@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -disable-availability-checking
+// RUN: %target-typecheck-verify-swift -disable-availability-checking -enable-opaque-result-types
 
 @_functionBuilder
 struct TupleBuilder { // expected-note 2{{struct 'TupleBuilder' declared here}}

branches/rxwei-patch-1/test/type/opaque.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -disable-availability-checking -typecheck -verify %s
+// RUN: %target-swift-frontend -disable-availability-checking -typecheck -verify -enable-opaque-result-types %s
 
 protocol P {
   func paul()