Merge remote-tracking branch 'origin/master' into swift-3-api-guidelines

Author: Max Moiseev

CMakeLists.txt

@@ -140,9 +140,6 @@ option(SWIFT_RUNTIME_CRASH_REPORTER_CLIENT
 set(SWIFT_DARWIN_XCRUN_TOOLCHAIN "XcodeDefault" CACHE STRING
     "The name of the toolchain to pass to 'xcrun'")
 
-set(SWIFT_DARWIN_ICU_INCLUDE_PATH "" CACHE STRING
-    "Path to the directory where the ICU headers are located")
-
 set(SWIFT_DARWIN_STDLIB_INSTALL_NAME_DIR "@rpath" CACHE STRING
     "The directory of the install_name for standard library dylibs")
 
@@ -307,7 +304,6 @@ set(SWIFT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
 
 set(SWIFT_RUNTIME_OUTPUT_INTDIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin")
 set(SWIFT_LIBRARY_OUTPUT_INTDIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib")
-set(SWIFT_INCLUDE_OUTPUT_INTDIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/include")
 if("${SWIFT_NATIVE_SWIFT_TOOLS_PATH}" STREQUAL "")
   set(SWIFT_NATIVE_SWIFT_TOOLS_PATH "${SWIFT_RUNTIME_OUTPUT_INTDIR}")
 endif()

benchmark/scripts/Benchmark_Driver

@@ -62,7 +62,7 @@ def parse_results(res, optset):
             tests.append(mem_test)
     return tests
 
-def submit_to_LNT(data, url):
+def submit_to_lnt(data, url):
     print "\nSubmitting results to LNT server..."
     json_report = {'input_data': json.dumps(data), 'commit': '1'}
     data = urllib.urlencode(json_report)
@@ -224,7 +224,7 @@ def submit(args):
                    'Start Time': starttime}
     print "End time:\t", endtime
 
-    submit_to_LNT(data, args.lnt_host)
+    submit_to_lnt(data, args.lnt_host)
     return 0
 
 def run(args):

benchmark/scripts/compare_perf_tests.py

@@ -35,13 +35,13 @@
 ShowSpeedup = 1
 PrintAllScores = 0
 
-def parseInt(word):
+def parse_int(word):
     try:
         return int(word)
     except:
         raise Exception("Expected integer value, not " + word)
 
-def getScores(fname):
+def get_scores(fname):
     scores = {}
     worstscores = {}
     nums = {}
@@ -65,8 +65,8 @@ def getScores(fname):
             if not m.group(KEYGROUP) in scores:
                 scores[m.group(KEYGROUP)] = []
                 worstscores[m.group(KEYGROUP)] = []
-            scores[m.group(KEYGROUP)].append(parseInt(m.group(BESTGROUP)))
-            worstscores[m.group(KEYGROUP)].append(parseInt(m.group(WORSTGROUP)))
+            scores[m.group(KEYGROUP)].append(parse_int(m.group(BESTGROUP)))
+            worstscores[m.group(KEYGROUP)].append(parse_int(m.group(WORSTGROUP)))
             if is_total:
                 nums[m.group(KEYGROUP)] = ""
             else:
@@ -77,10 +77,10 @@ def getScores(fname):
         f.close()
     return scores, worstscores, runs, nums
 
-def isMaxScore(newscore, maxscore, invert):
+def is_max_score(newscore, maxscore, invert):
     return not maxscore or (newscore > maxscore if not invert else newscore < maxscore)
 
-def compareScores(key, score1, worstsample1, score2, worstsample2, runs, num):
+def compare_scores(key, score1, worstsample1, score2, worstsample2, runs, num):
     print num.rjust(3),
     print key.ljust(25),
     bestscore1 = None
@@ -91,25 +91,25 @@ def compareScores(key, score1, worstsample1, score2, worstsample2, runs, num):
     minworst = not minbest
     r = 0
     for score in score1:
-        if isMaxScore(newscore=score, maxscore=bestscore1, invert=minbest):
+        if is_max_score(newscore=score, maxscore=bestscore1, invert=minbest):
             bestscore1 = score
-        if isMaxScore(newscore=score, maxscore=worstscore1, invert=minworst):
+        if is_max_score(newscore=score, maxscore=worstscore1, invert=minworst):
             worstscore1 = score
         if PrintAllScores:
             print ("%d" % score).rjust(16),
     for score in worstsample1:
-        if isMaxScore(newscore=score, maxscore=worstscore1, invert=minworst):
+        if is_max_score(newscore=score, maxscore=worstscore1, invert=minworst):
             worstscore1 = score
     for score in score2:
-        if isMaxScore(newscore=score, maxscore=bestscore2, invert=minbest):
+        if is_max_score(newscore=score, maxscore=bestscore2, invert=minbest):
             bestscore2 = score
-        if isMaxScore(newscore=score, maxscore=worstscore2, invert=minworst):
+        if is_max_score(newscore=score, maxscore=worstscore2, invert=minworst):
             worstscore2 = score
         if PrintAllScores:
             print ("%d" % score).rjust(16),
         r += 1
     for score in worstsample2:
-        if isMaxScore(newscore=score, maxscore=worstscore2, invert=minworst):
+        if is_max_score(newscore=score, maxscore=worstscore2, invert=minworst):
             worstscore2 = score
     while r < runs:
         if PrintAllScores:
@@ -136,20 +136,20 @@ def compareScores(key, score1, worstsample1, score2, worstsample2, runs, num):
     # check if the worst->best interval for each configuration overlap.
     if minbest:
         if (bestscore1 < bestscore2 and bestscore2 < worstscore1) \
-        or (bestscore2 < bestscore1 and bestscore1 < worstscore2):
+           or (bestscore2 < bestscore1 and bestscore1 < worstscore2):
             print "(?)",
     else:
         if (worstscore1 < worstscore2 and worstscore2 < bestscore1) \
-        or (worstscore2 < worstscore1 and worstscore1 < bestscore2):
+           or (worstscore2 < worstscore1 and worstscore1 < bestscore2):
             print "(?)",
     print
 
-def printBestScores(key, scores):
+def print_best_scores(key, scores):
     print key,
     bestscore = None
     minbest = IsTime
     for score in scores:
-        if isMaxScore(newscore=score, maxscore=bestscore, invert=minbest):
+        if is_max_score(newscore=score, maxscore=bestscore, invert=minbest):
             bestscore = score
     print ", %d" % bestscore
 
@@ -163,19 +163,19 @@ def usage():
         sys.exit(1)
     file1 = sys.argv[1]
     if len(sys.argv) < 3:
-        scores, worstscores, runs, nums = getScores(file1)
+        scores, worstscores, runs, nums = get_scores(file1)
         keys = list(set(scores.keys()))
         keys.sort()
         for key in keys:
-            printBestScores(key, scores[key])
+            print_best_scores(key, scores[key])
         sys.exit(0)
 
     file2 = sys.argv[2]
     if len(sys.argv) > 3:
         SCORERE = re.compile(sys.argv[3])
 
-    scores1, worstscores1, runs1, nums = getScores(file1)
-    scores2, worstscores2, runs2, nums = getScores(file2)
+    scores1, worstscores1, runs1, nums = get_scores(file1)
+    scores2, worstscores2, runs2, nums = get_scores(file2)
 
     runs = runs1
     if runs2 > runs:
@@ -213,4 +213,4 @@ def usage():
         if key not in scores2:
             print key, "not in", file2
             continue
-        compareScores(key, scores1[key], worstscores1[key], scores2[key], worstscores2[key], runs, nums[key])
+        compare_scores(key, scores1[key], worstscores1[key], scores2[key], worstscores2[key], runs, nums[key])

cmake/modules/AddSwift.cmake

@@ -89,14 +89,14 @@ function(_add_variant_c_compile_link_flags)
       "-F" "${SWIFT_SDK_${CFLAGS_SDK}_PATH}/../../../Developer/Library/Frameworks"
       "-m${SWIFT_SDK_${CFLAGS_SDK}_VERSION_MIN_NAME}-version-min=${DEPLOYMENT_VERSION}")
 
-    if(analyze_code_coverage)
+    if(CFLAGS_ANALYZE_CODE_COVERAGE)
       list(APPEND result "-fprofile-instr-generate"
                          "-fcoverage-mapping")
     endif()
+  endif()
 
-    if(enable_lto)
-      list(APPEND result "-flto")
-    endif()
+  if(CFLAGS_ENABLE_LTO)
+    list(APPEND result "-flto")
   endif()
 
   set("${CFLAGS_RESULT_VAR_NAME}" "${result}" PARENT_SCOPE)
@@ -117,7 +117,7 @@ function(_add_variant_c_compile_flags)
     ARCH "${CFLAGS_ARCH}"
     BUILD_TYPE "${CFLAGS_BUILD_TYPE}"
     ENABLE_ASSERTIONS "${CFLAGS_ENABLE_ASSERTIONS}"
-    SWIFT_ENABLE_LTO "${SWIFT_ENABLE_LTO}"
+    ENABLE_LTO "${SWIFT_ENABLE_LTO}"
     ANALYZE_CODE_COVERAGE FALSE
     DEPLOYMENT_VERSION_IOS "${CFLAGS_DEPLOYMENT_VERSION_IOS}"
     RESULT_VAR_NAME result)
@@ -136,7 +136,11 @@ function(_add_variant_c_compile_flags)
 
   is_build_type_with_debuginfo("${CFLAGS_BUILD_TYPE}" debuginfo)
   if(debuginfo)
-    list(APPEND result "-g")
+    if(SWIFT_ENABLE_LTO)
+      list(APPEND result "-gline-tables-only")
+    else()
+      list(APPEND result "-g")
+    endif()
   else()
     list(APPEND result "-g0")
   endif()
@@ -1859,6 +1863,8 @@ function(add_swift_target_executable name)
 
   # All Swift executables depend on the standard library.
   list(APPEND SWIFTEXE_TARGET_LINK_FAT_LIBRARIES swiftCore)
+  # All Swift executables depend on the swiftSwiftOnoneSupport library.
+  list(APPEND SWIFTEXE_TARGET_DEPENDS swiftSwiftOnoneSupport)
 
   if(NOT "${SWIFT_BUILD_STDLIB}")
     list(REMOVE_ITEM SWIFTEXE_TARGET_LINK_FAT_LIBRARIES

include/swift/AST/ASTPrinter.h

@@ -47,7 +47,9 @@ enum class PrintNameContext {
 class ASTPrinter {
   unsigned CurrentIndentation = 0;
   unsigned PendingNewlines = 0;
-  const Decl *PendingDeclPreCallback = nullptr;
+  /// The queue of pending printDeclPre callbacks that will be run when we print
+  /// a non-whitespace character.
+  SmallVector<const Decl *, 4> PendingDeclPreCallbacks;
   const Decl *PendingDeclLocCallback = nullptr;
   Optional<PrintNameContext> PendingNamePreCallback;
   const NominalTypeDecl *SynthesizeTarget = nullptr;
@@ -59,19 +61,29 @@ class ASTPrinter {
 
   virtual void printText(StringRef Text) = 0;
 
+  // MARK: Callback interface.
+
   /// Called after the printer decides not to print D.
+  ///
+  /// Callers should use callAvoidPrintDeclPost().
   virtual void avoidPrintDeclPost(const Decl *D) {};
   /// Called before printing of a declaration.
+  ///
+  /// Callers should use callPrintDeclPre().
   virtual void printDeclPre(const Decl *D) {}
   /// Called before printing at the point which would be considered the location
   /// of the declaration (normally the name of the declaration).
+  ///
+  /// Callers should use callPrintDeclLoc().
   virtual void printDeclLoc(const Decl *D) {}
   /// Called after printing the name of the declaration.
   virtual void printDeclNameEndLoc(const Decl *D) {}
   /// Called after printing the name of a declaration, or in the case of
   /// functions its signature.
   virtual void printDeclNameOrSignatureEndLoc(const Decl *D) {}
   /// Called after finishing printing of a declaration.
+  ///
+  /// Callers should use callPrintDeclPost().
   virtual void printDeclPost(const Decl *D) {}
 
   /// Called before printing a type.
@@ -127,6 +139,9 @@ class ASTPrinter {
   }
 
   void setSynthesizedTarget(NominalTypeDecl *Target) {
+    assert((!SynthesizeTarget || !Target || Target == SynthesizeTarget) &&
+           "unexpected change of setSynthesizedTarget");
+    // FIXME: this can overwrite the original target with nullptr.
     SynthesizeTarget = Target;
   }
 
@@ -136,21 +151,48 @@ class ASTPrinter {
 
   virtual void printIndent();
 
+  // MARK: Callback interface wrappers that perform ASTPrinter bookkeeping.
+
   /// Schedule a \c printDeclPre callback to be called as soon as a
   /// non-whitespace character is printed.
   void callPrintDeclPre(const Decl *D) {
-    PendingDeclPreCallback = D;
+    PendingDeclPreCallbacks.emplace_back(D);
+  }
+
+  /// Make a callback to printDeclPost(), performing any necessary bookeeping.
+  void callPrintDeclPost(const Decl *D) {
+    if (!PendingDeclPreCallbacks.empty() &&
+        PendingDeclPreCallbacks.back() == D) {
+      // Nothing printed for D; skip both pre and post callbacks.
+      // Ideally we wouldn't get as far as setting up the callback if we aren't
+      // going to print anything, but currently that would mean walking the
+      // children of top-level code decls to determine.
+      PendingDeclPreCallbacks.pop_back();
+      return;
+    }
+    printDeclPost(D);
+  }
+
+  /// Make a callback to avoidPrintDeclPost(), performing any necessary
+  /// bookkeeping.
+  void callAvoidPrintDeclPost(const Decl *D) {
+    assert((PendingDeclPreCallbacks.empty() ||
+            PendingDeclPreCallbacks.back() != D) &&
+           "printDeclPre should not be called on avoided decl");
+    avoidPrintDeclPost(D);
   }
 
   /// Schedule a \c printDeclLoc callback to be called as soon as a
   /// non-whitespace character is printed.
   void callPrintDeclLoc(const Decl *D) {
+    assert(!PendingDeclLocCallback && "unexpected nested callPrintDeclLoc");
     PendingDeclLocCallback = D;
   }
 
   /// Schedule a \c printNamePre callback to be called as soon as a
   /// non-whitespace character is printed.
   void callPrintNamePre(PrintNameContext Context) {
+    assert(!PendingNamePreCallback && "unexpected nested callPrintNamePre");
     PendingNamePreCallback = Context;
   }
 

include/swift/AST/Decl.h

@@ -19,6 +19,7 @@
 
 #include "swift/AST/CaptureInfo.h"
 #include "swift/AST/ClangNode.h"
+#include "swift/AST/ConcreteDeclRef.h"
 #include "swift/AST/DefaultArgumentKind.h"
 #include "swift/AST/ExprHandle.h"
 #include "swift/AST/GenericSignature.h"
@@ -3609,17 +3610,20 @@ enum class AccessStrategy : unsigned char {
 struct BehaviorRecord {
   // The behavior name.
   TypeRepr *ProtocolName;
-  // The parameter function, if any.
-  FuncDecl *Param;
+  // The parameter expression, if any.
+  Expr *Param;
 
   Optional<NormalProtocolConformance *> Conformance = None;
   // The 'value' property from the behavior protocol that provides the property
   // implementation.
   VarDecl *ValueDecl = nullptr;
 
+  // Storage declaration and initializer for use by definite initialization.
+  VarDecl *StorageDecl = nullptr;
+  ConcreteDeclRef InitStorageDecl = nullptr;
 
   BehaviorRecord(TypeRepr *ProtocolName,
-                 FuncDecl *Param)
+                 Expr *Param)
     : ProtocolName(ProtocolName), Param(Param)
   {}
 
@@ -3919,7 +3923,7 @@ class AbstractStorageDecl : public ValueDecl {
   void setComputedSetter(FuncDecl *Set);
 
   /// \brief Add a behavior to a property.
-  void addBehavior(TypeRepr *Type, FuncDecl *Param);
+  void addBehavior(TypeRepr *Type, Expr *Param);
 
   /// \brief Set a materializeForSet accessor for this declaration.
   ///

include/swift/AST/DiagnosticsFrontend.def

@@ -52,6 +52,9 @@ ERROR(error_unsupported_target_os, none,
 ERROR(error_unsupported_target_arch, none,
   "unsupported target architecture: '%0'", (StringRef))
 
+ERROR(error_unsupported_opt_for_target, none,
+  "unsupported option '%0' for target '%1'", (StringRef, StringRef))
+
 ERROR(cannot_open_file,none,
   "cannot open file '%0' (%1)", (StringRef, StringRef))
 ERROR(cannot_open_serialized_file,none,
@@ -67,6 +70,8 @@ ERROR(error_unknown_arg,none,
   "unknown argument: '%0'", (StringRef))
 ERROR(error_invalid_arg_value,none,
   "invalid value '%1' in '%0'", (StringRef, StringRef))
+ERROR(error_unsupported_option_argument,none,
+  "unsupported argument '%1' to option '%0'", (StringRef, StringRef))
 ERROR(error_immediate_mode_missing_stdlib,none,
   "could not load the swift standard library", ())
 ERROR(error_immediate_mode_missing_library,none,

include/swift/AST/DiagnosticsParse.def

@@ -256,6 +256,9 @@ ERROR(addressor_with_getter,none,
 ERROR(addressor_with_setter,none,
       "%select{variable|subscript}0 cannot provide both 'address' and "
       "a setter; use an ordinary getter instead", (unsigned))
+ERROR(behavior_multiple_vars,none,
+      "applying property behavior with parameter to multiple variables is "
+      "not supported", ())
 
 // Import
 ERROR(decl_expected_module_name,none,