---

yaml
---
r: 315118
b: refs/heads/master-next
c: 44af3a9
h: refs/heads/master

Author: jckarter

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3fe9333052029c114ef816ea805c335eb1ee8a99
-refs/heads/master-next: e6bc3e7adf9e49004aa5c815b610fc0e6f2fe52c
+refs/heads/master-next: 44af3a9398914ef8bdb92eea37d235a92be60925
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/docs/SIL.rst

@@ -4879,7 +4879,7 @@ convert_escape_to_noescape
   //   (see convert_function)
   // %1 will be of the trivial type $@noescape T -> U
 
-Converts an escaping (non-trivial) function type to an ``@noescape`` trivial
+Converts an escaping (non-trivial) function type to a ``@noescape`` trivial
 function type. Something must guarantee the lifetime of the input ``%0`` for the
 duration of the use ``%1``.
 

branches/master-next/docs/libFuzzerIntegration.rst

@@ -19,13 +19,13 @@ the ``main`` symbol, such that the fuzzer entry point can be used:
 
 .. code-block:: bash
 
-    % swiftc -sanitize=fuzzer myfile.swift
+    % swiftc -sanitize=fuzzer -parse-as-library myfile.swift
 
 ``libFuzzer`` can be also combined with other sanitizers:
 
 .. code-block:: bash
 
-    % swiftc -sanitize=fuzzer,address myfile.swift
+    % swiftc -sanitize=fuzzer,address -parse-as-library myfile.swift
 
 Finally, we launch the fuzzing process:
 

branches/master-next/include/swift/AST/ASTContext.h

@@ -639,8 +639,10 @@ class ASTContext final {
   /// \param isClang \c true if this module loader is responsible for loading
   ///                Clang modules, which are special-cased in some parts of the
   ///                compiler.
+  /// \param isDWARF \c true if this module loader can load Clang modules
+  ///                from DWARF.
   void addModuleLoader(std::unique_ptr<ModuleLoader> loader,
-                       bool isClang = false);
+                       bool isClang = false, bool isDWARF = false);
 
   /// Load extensions to the given nominal type from the external
   /// module loaders.
@@ -683,6 +685,12 @@ class ASTContext final {
   /// The loader is owned by the AST context.
   ClangModuleLoader *getClangModuleLoader() const;
 
+  /// Retrieve the DWARF module loader for this ASTContext.
+  ///
+  /// If there is no Clang module loader, returns a null pointer.
+  /// The loader is owned by the AST context.
+  ClangModuleLoader *getDWARFModuleLoader() const;
+  
   /// Asks every module loader to verify the ASTs it has loaded.
   ///
   /// Does nothing in non-asserts (NDEBUG) builds.