Merge remote-tracking branch 'origin/master' into master-next

This commit is contained in:
Bob Wilson
2017-04-05 17:26:52 -07:00
38 changed files with 509 additions and 335 deletions

View File

@@ -21,6 +21,7 @@
#include "swift/Basic/Dwarf.h"
#include "swift/Demangling/ManglingMacros.h"
#include "swift/ClangImporter/ClangImporter.h"
#include "swift/IRGen/Linking.h"
#include "swift/Runtime/RuntimeFnWrappersGen.h"
#include "swift/Runtime/Config.h"
#include "clang/AST/ASTContext.h"
@@ -48,7 +49,6 @@
#include "GenType.h"
#include "IRGenModule.h"
#include "IRGenDebugInfo.h"
#include "Linking.h"
#include <initializer_list>