---

yaml
---
r: 348019
b: refs/heads/master
c: 9f1204d
h: refs/heads/master
i:
  348017: 4598a37
  348015: 9a3c849

Author: plotfi

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 7ab888a38d15f69519007fbd40d7c9dc84d2d438
+refs/heads/master: 9f1204d817ba59ba2536d606e5af2d52318d306b
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/ClangImporter/ImportDecl.cpp

@@ -1140,14 +1140,14 @@ makeBitFieldAccessors(ClangImporter::Implementation &Impl,
                                                         recordType,
                                                         clang::VK_RValue,
                                                         clang::SourceLocation());
-    auto cGetterExpr = new (Ctx) clang::MemberExpr(cGetterSelfExpr,
-                                                   /*isarrow=*/ false,
-                                                   clang::SourceLocation(),
-                                                   fieldDecl,
-                                                   fieldNameInfo,
-                                                   fieldType,
-                                                   clang::VK_RValue,
-                                                   clang::OK_BitField);
+    auto cGetterExpr = clang::MemberExpr::CreateImplicit(Ctx,
+                                                         cGetterSelfExpr,
+                                                         /*isarrow=*/ false,
+                                                         fieldDecl,
+                                                         fieldType,
+                                                         clang::VK_RValue,
+                                                         clang::OK_BitField);
+
 
     auto cGetterBody = clang::ReturnStmt::Create(Ctx, clang::SourceLocation(),
                                                    cGetterExpr,
@@ -1185,14 +1185,13 @@ makeBitFieldAccessors(ClangImporter::Implementation &Impl,
                                                         clang::VK_RValue,
                                                         clang::SourceLocation());
 
-    auto cSetterMemberExpr = new (Ctx) clang::MemberExpr(cSetterSelfExpr,
-                                                         /*isarrow=*/ true,
-                                                         clang::SourceLocation(),
-                                                         fieldDecl,
-                                                         fieldNameInfo,
-                                                         fieldType,
-                                                         clang::VK_LValue,
-                                                         clang::OK_BitField);
+    auto cSetterMemberExpr = clang::MemberExpr::CreateImplicit(Ctx,
+                                                               cSetterSelfExpr,
+                                                               /*isarrow=*/true,
+                                                               fieldDecl,
+                                                               fieldType,
+                                                               clang::VK_LValue,
+                                                               clang::OK_BitField);
 
     auto cSetterValueExpr = new (Ctx) clang::DeclRefExpr(Ctx, cSetterValue, false,
                                                          fieldType,

trunk/tools/SourceKit/lib/SwiftLang/SwiftASTManager.cpp

@@ -186,15 +186,6 @@ namespace SourceKit {
 
   void ASTUnit::Implementation::consumeAsync(SwiftASTConsumerRef ConsumerRef,
                                              ASTUnitRef ASTRef) {
-#if defined(_WIN32)
-	// Windows uses more up for stack space (why?) than macOS/Linux which
-	// causes stack overflows in a dispatch thread with 64k stack. Passing
-	// useDeepStack=true means it's given a _beginthreadex thread with an 8MB
-	// stack.
-	bool useDeepStack = true;
-#else
-	bool useDeepStack = false;
-#endif
     Queue.dispatch([ASTRef, ConsumerRef]{
       SwiftASTConsumer &ASTConsumer = *ConsumerRef;
 
@@ -206,7 +197,7 @@ namespace SourceKit {
         LOG_WARN_FUNC("did not find primary SourceFile");
         ConsumerRef->failed("did not find primary SourceFile");
       }
-    }, useDeepStack);
+    });
   }
 
   ASTUnit::ASTUnit(uint64_t Generation, std::shared_ptr<SwiftStatistics> Stats)

trunk/tools/SourceKit/tools/sourcekitd-test/sourcekitd-test.cpp

@@ -26,12 +26,11 @@
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/Regex.h"
 #include "llvm/Support/Signals.h"
-#include "llvm/Support/Threading.h"
 #include "llvm/Support/raw_ostream.h"
 #include <fstream>
 #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
-#include <sys/param.h>
 #include <unistd.h>
+#include <sys/param.h>
 #elif defined(_WIN32)
 #define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
@@ -212,26 +211,18 @@ static void printBufferedNotifications(bool syncWithService = true) {
   });
 }
 
-struct skt_args {
-  int argc;
-  const char **argv;
-  int ret;
-};
-static void skt_main(skt_args *args);
+static int skt_main(int argc, const char **argv);
 
 int main(int argc, const char **argv) {
   dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
-    skt_args args = {argc, argv, 0};
-    llvm::llvm_execute_on_thread((void (*)(void *))skt_main, &args);
-    exit(args.ret);
+    int ret = skt_main(argc, argv);
+    exit(ret);
   });
 
   dispatch_main();
 }
 
-static void skt_main(skt_args *args) {
-  int argc = args->argc;
-  const char **argv = args->argv;
+static int skt_main(int argc, const char **argv) {
   llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
 
   sourcekitd_initialize();
@@ -270,16 +261,14 @@ static void skt_main(skt_args *args) {
       break;
     if (int ret = handleTestInvocation(Args.slice(0, i), InitOpts)) {
       sourcekitd_shutdown();
-      args->ret = ret;
-      return;
+      return ret;
     }
-    Args = Args.slice(i + 1);
+    Args = Args.slice(i+1);
   }
 
   if (int ret = handleTestInvocation(Args, InitOpts)) {
     sourcekitd_shutdown();
-    args->ret = ret;
-    return;
+    return ret;
   }
 
   for (auto &info : asyncResponses) {
@@ -290,15 +279,13 @@ static void skt_main(skt_args *args) {
     if (handleResponse(info.response, info.options, info.sourceFilename,
                        std::move(info.sourceBuffer), nullptr)) {
       sourcekitd_shutdown();
-      args->ret = 1;
-      return;
+      return 1;
     }
   }
   printBufferedNotifications();
 
   sourcekitd_shutdown();
-  args->ret = 0;
-  return;
+  return 0;
 }
 
 static inline const char *getInterfaceGenDocumentName() {