---

yaml
---
r: 339903
b: refs/heads/rxwei-patch-1
c: 20b24c5
h: refs/heads/master
i:
  339901: 8fbcbe6
  339899: 681fa32
  339895: 668639b
  339887: ffeed6b
  339871: 3b14209
  339839: 0b8e696

Author: mikeash

[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: 44f0e93747901cc14de78ff19325365f2c6afdcb
+refs/heads/rxwei-patch-1: 20b24c54b59b40528be6995b79de2c40e93fbd5a
 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/benchmark/scripts/compare_perf_tests.py

@@ -547,6 +547,15 @@ def __init__(self, comparator, changes_only,
         self.changes_only = changes_only
         self.single_table = single_table
 
+    MARKDOWN_DETAIL = """
+<details {3}>
+  <summary>{0} ({1})</summary>
+  {2}
+</details>
+"""
+    GIT_DETAIL = """
+{0} ({1}): {2}"""
+
     PERFORMANCE_TEST_RESULT_HEADER = ('TEST', 'MIN', 'MAX', 'MEAN', 'MAX_RSS')
     RESULT_COMPARISON_HEADER = ('TEST', 'OLD', 'NEW', 'DELTA', 'RATIO')
 
@@ -580,26 +589,16 @@ def values(result):
     def markdown(self):
         """Report results of benchmark comparisons in Markdown format."""
         return self._formatted_text(
-            label_formatter=lambda s: ('**' + s + '**'),
-            COLUMN_SEPARATOR=' | ',
-            DELIMITER_ROW=([':---'] + ['---:'] * 4),
-            SEPARATOR='&nbsp; | | | | \n',
-            SECTION="""
-<details {3}>
-  <summary>{0} ({1})</summary>
-  {2}
-</details>
-""")
+            ROW='{0} | {1} | {2} | {3} | {4} \n',
+            HEADER_SEPARATOR='---',
+            DETAIL=self.MARKDOWN_DETAIL)
 
     def git(self):
         """Report results of benchmark comparisons in 'git' format."""
         return self._formatted_text(
-            label_formatter=lambda s: s.upper(),
-            COLUMN_SEPARATOR='   ',
-            DELIMITER_ROW=None,
-            SEPARATOR='\n',
-            SECTION="""
-{0} ({1}): \n{2}""")
+            ROW='{0}   {1}   {2}   {3}   {4} \n',
+            HEADER_SEPARATOR='   ',
+            DETAIL=self.GIT_DETAIL)
 
     def _column_widths(self):
         changed = self.comparator.decreased + self.comparator.increased
@@ -615,49 +614,53 @@ def _column_widths(self):
         ]
 
         def max_widths(maximum, widths):
-            return map(max, zip(maximum, widths))
+            return tuple(map(max, zip(maximum, widths)))
 
-        return reduce(max_widths, widths, [0] * 5)
+        return reduce(max_widths, widths, tuple([0] * 5))
 
-    def _formatted_text(self, label_formatter, COLUMN_SEPARATOR,
-                        DELIMITER_ROW, SEPARATOR, SECTION):
+    def _formatted_text(self, ROW, HEADER_SEPARATOR, DETAIL):
         widths = self._column_widths()
         self.header_printed = False
 
         def justify_columns(contents):
-            return [c.ljust(w) for w, c in zip(widths, contents)]
+            return tuple([c.ljust(w) for w, c in zip(widths, contents)])
 
         def row(contents):
-            return ('' if not contents else
-                    COLUMN_SEPARATOR.join(justify_columns(contents)) + '\n')
-
-        def header(title, column_labels):
-            labels = (column_labels if not self.single_table else
-                      map(label_formatter, (title, ) + column_labels[1:]))
-            h = (('' if not self.header_printed else SEPARATOR) +
-                 row(labels) +
-                 (row(DELIMITER_ROW) if not self.header_printed else ''))
-            if self.single_table and not self.header_printed:
-                self.header_printed = True
-            return h
-
-        def format_columns(r, is_strong):
-            return (r if not is_strong else
-                    r[:-1] + ('**' + r[-1] + '**', ))
+            return ROW.format(*justify_columns(contents))
+
+        def header(header):
+            return '\n' + row(header) + row(tuple([HEADER_SEPARATOR] * 5))
+
+        def format_columns(r, strong):
+            return (r if not strong else
+                    r[:-1] + ('**{0}**'.format(r[-1]), ))
 
         def table(title, results, is_strong=False, is_open=False):
-            if not results:
+            rows = [
+                row(format_columns(ReportFormatter.values(r), is_strong))
+                for r in results
+            ]
+            if not rows:
                 return ''
-            rows = [row(format_columns(ReportFormatter.values(r), is_strong))
-                    for r in results]
-            table = (header(title if self.single_table else '',
-                            ReportFormatter.header_for(results[0])) +
-                     ''.join(rows))
-            return (table if self.single_table else
-                    SECTION.format(
-                        title, len(results), table, 'open' if is_open else ''))
-
-        return '\n' + ''.join([
+
+            if self.single_table:
+                t = ''
+                if not self.header_printed:
+                    t += header(ReportFormatter.header_for(results[0]))
+                    self.header_printed = True
+                t += row(('**' + title + '**', '', '', '', ''))
+                t += ''.join(rows)
+                return t
+
+            return DETAIL.format(
+                *[
+                    title, len(results),
+                    (header(ReportFormatter.header_for(results[0])) +
+                     ''.join(rows)),
+                    ('open' if is_open else '')
+                ])
+
+        return ''.join([
             table('Regression', self.comparator.decreased, True, True),
             table('Improvement', self.comparator.increased, True),
             ('' if self.changes_only else

branches/rxwei-patch-1/benchmark/scripts/run_smoke_bench

@@ -88,7 +88,7 @@ def main():
         help='In addition to stdout, write the results into a markdown file')
     argparser.add_argument(
         '-threshold', type=float,
-        help='The performance threshold in %% which triggers a re-run',
+        help='The performance threshold in % which triggers a re-run',
         default=5)
     argparser.add_argument(
         '-num-samples', type=int,

branches/rxwei-patch-1/benchmark/scripts/test_compare_perf_tests.py

@@ -759,7 +759,7 @@ def test_column_headers(self):
         )
         self.assert_markdown_contains([
             'TEST                  | OLD    | NEW    | DELTA   | RATIO',
-            ':---                  | ---:   | ---:   | ---:    | ---:   ',
+            '---                   | ---    | ---    | ---     | ---    ',
             'TEST                  | MIN    | MAX    | MEAN    | MAX_RSS'])
         self.assert_git_contains([
             'TEST                    OLD      NEW      DELTA     RATIO',
@@ -855,36 +855,6 @@ def test_report_only_changes(self):
         self.assertNotIn('No Changes', html)
         self.assertNotIn('AngryPhonebook', html)
 
-    def test_single_table_report(self):
-        """Single table report has inline headers and no elaborate sections."""
-        self.tc.removed = []  # test handling empty section
-        rf = ReportFormatter(self.tc, changes_only=True, single_table=True)
-        markdown = rf.markdown()
-        self.assertNotIn('<details', markdown)  # no sections
-        self.assertNotIn('\n\n', markdown)  # table must not be broken
-        self.assertNotIn('Removed', markdown)
-        self.assert_report_contains([
-            '\n**Regression** ',
-            '| **OLD**', '| **NEW**', '| **DELTA**', '| **RATIO**',
-            '\n**Added** ',
-            '| **MIN**', '| **MAX**', '| **MEAN**', '| **MAX_RSS**'
-        ], markdown)
-        # Single delimiter row:
-        self.assertIn('\n:---', markdown)  # first column is left aligned
-        self.assertEqual(markdown.count('| ---:'), 4)  # other, right aligned
-        # Separator before every inline header (new section):
-        self.assertEqual(markdown.count('&nbsp; | | | | '), 2)
-
-        git = rf.git()
-        self.assertNotIn('): \n', git)  # no sections
-        self.assertNotIn('REMOVED', git)
-        self.assert_report_contains([
-            '\nREGRESSION ', ' OLD ', ' NEW ', ' DELTA ', ' RATIO ',
-            '\n\nADDED ', ' MIN ', ' MAX ', ' MEAN ', ' MAX_RSS '
-        ], git)
-        # Separator before every inline header (new section):
-        self.assertEqual(git.count('\n\n'), 2)
-
 
 class Test_parse_args(unittest.TestCase):
     required = ['--old-file', 'old.log', '--new-file', 'new.log']

branches/rxwei-patch-1/include/swift/ABI/Metadata.h

@@ -3121,6 +3121,10 @@ struct MetadataCompletionContext {
 /// it may be called many times as successive dependencies are resolved.
 /// If the function ever completes successfully (by returning null), it
 /// will not be called again for the same type.
+///
+/// \return null to indicate that the type has been completed, or a non-null
+///   pointer to indicate that completion is blocked on the completion of
+///   some other type
 using MetadataCompleter =
   SWIFT_CC(swift)
   MetadataDependency(const Metadata *type,

branches/rxwei-patch-1/include/swift/AST/DiagnosticsParse.def

@@ -68,10 +68,6 @@ ERROR(extra_tokens_conditional_compilation_directive,none,
       "extra tokens following conditional compilation directive", ())
 ERROR(unexpected_rbrace_in_conditional_compilation_block,none,
       "unexpected '}' in conditional compilation block", ())
-ERROR(unexpected_if_following_else_compilation_directive,none,
-      "unexpected 'if' keyword following '#else' conditional compilation "
-      "directive; did you mean '#elseif'?",
-      ())
 
 ERROR(pound_diagnostic_expected_string,none,
       "expected string literal in %select{#warning|#error}0 directive",(bool))

branches/rxwei-patch-1/include/swift/IDE/DigesterEnums.def

@@ -135,7 +135,6 @@ KEY_BOOL(HasDidset, hasDidset)
 KEY_BOOL(HasWillset, hasWillset)
 KEY_BOOL(ReqNewWitnessTableEntry, reqNewWitnessTableEntry)
 KEY_BOOL(IsABIPlaceholder, isABIPlaceholder)
-KEY_BOOL(IsExternal, isExternal)
 
 KEY(kind)
 
@@ -149,11 +148,6 @@ KEY_STRING(EnumRawTypeName, enumRawTypeName)
 KEY_STRING(GenericSig, genericSig)
 KEY_STRING(FuncSelfKind, funcSelfKind)
 KEY_STRING(ParamValueOwnership, paramValueOwnership)
-KEY_STRING(IntromacOS, intro_Macosx)
-KEY_STRING(IntroiOS, intro_iOS)
-KEY_STRING(IntrotvOS, intro_tvOS)
-KEY_STRING(IntrowatchOS, intro_watchOS)
-KEY_STRING(Introswift, intro_swift)
 
 KEY_STRING_ARR(SuperclassNames, superclassNames)
 

branches/rxwei-patch-1/include/swift/Runtime/Metadata.h

@@ -271,6 +271,7 @@ const
 
 /// True if two context descriptors in the currently running program describe
 /// the same context.
+SWIFT_RUNTIME_EXPORT
 bool equalContexts(const ContextDescriptor *a, const ContextDescriptor *b);
 
 /// Compute the bounds of class metadata with a resilient superclass.

branches/rxwei-patch-1/lib/IRGen/GenDecl.cpp

@@ -1316,25 +1316,6 @@ static std::string getDynamicReplacementSection(IRGenModule &IGM) {
   return sectionName;
 }
 
-static std::string getDynamicReplacementSomeSection(IRGenModule &IGM) {
-  std::string sectionName;
-  switch (IGM.TargetInfo.OutputObjectFormat) {
-  case llvm::Triple::UnknownObjectFormat:
-    llvm_unreachable("Don't know how to emit field records table for "
-                     "the selected object format.");
-  case llvm::Triple::MachO:
-    sectionName = "__TEXT, __swift5_replac2, regular, no_dead_strip";
-    break;
-  case llvm::Triple::ELF:
-  case llvm::Triple::Wasm:
-    sectionName = "swift5_replac2";
-    break;
-  case llvm::Triple::COFF:
-    sectionName = ".sw5reps$B";
-    break;
-  }
-  return sectionName;
-}
 llvm::GlobalVariable *IRGenModule::getGlobalForDynamicallyReplaceableThunk(
     LinkEntity &entity, llvm::Type *type, ForDefinition_t forDefinition) {
   return cast<llvm::GlobalVariable>(
@@ -1488,41 +1469,6 @@ void IRGenerator::emitDynamicReplacements() {
       /*isConstant*/ true, llvm::GlobalValue::PrivateLinkage);
   autoReplVar->setSection(getDynamicReplacementSection(IGM));
   IGM.addUsedGlobal(autoReplVar);
-
-  if (origFuncTypes.empty())
-    return;
-  // Emit records for replacing opaque type descriptor for some types.
-  // struct AutomaticReplacementsSome {
-  //   uint32t flags; // unused
-  //   uint32t numReplacements;
-  //   struct Entry {
-  //     RelativeIndirectablePointer<OpaqueTypeDescriptor*> orig;
-  //     RelativeDirectPointer<OpaqueTypeDescriptor*> replacement;
-  //     uint32_t flags; // unused.
-  //   }[numEntries]
-  // };
-  auto autoReplacementsSome = builder.beginStruct();
-  autoReplacementsSome.addInt32(0); // unused flags.
-  autoReplacementsSome.addInt32(
-      origFuncTypes.size()); // number of replacement entries.
-  auto someReplacementsArray = autoReplacementsSome.beginArray();
-  for (auto i : indices(origFuncTypes)) {
-    auto origDesc =
-        LinkEntity::forOpaqueTypeDescriptor(origFuncTypes[i]->getDecl());
-    auto replDesc =
-        LinkEntity::forOpaqueTypeDescriptor(newFuncTypes[i]->getDecl());
-    auto replacement = someReplacementsArray.beginStruct();
-    replacement.addRelativeAddress(
-        IGM.getAddrOfLLVMVariableOrGOTEquivalent(origDesc));
-    replacement.addRelativeAddress(
-        IGM.getAddrOfLLVMVariableOrGOTEquivalent(replDesc));
-    replacement.finishAndAddTo(someReplacementsArray);
-  }
-  someReplacementsArray.finishAndAddTo(autoReplacementsSome);
-  auto autoReplVar2 = autoReplacementsSome.finishAndCreateGlobal(
-      "\x01l_auto_dynamic_replacements_some", IGM.getPointerAlignment(),
-      /*isConstant*/ true, llvm::GlobalValue::PrivateLinkage);
-  autoReplVar2->setSection(getDynamicReplacementSomeSection(IGM));
 }
 
 void IRGenerator::emitEagerClassInitialization() {