wip do not merge

Author: egorzhdan

lib/ClangImporter/ClangImporter.cpp

@@ -704,8 +704,10 @@ importer::getNormalInvocationArguments(
   }
 
   if (searchPathOpts.getSDKPath().empty()) {
-    invocationArgStrs.push_back("-Xclang");
-    invocationArgStrs.push_back("-nostdsysteminc");
+    if (!triple.isOSLinux()) {
+      invocationArgStrs.push_back("-Xclang");
+      invocationArgStrs.push_back("-nostdsysteminc");
+    }
   } else {
     if (triple.isWindowsMSVCEnvironment()) {
       llvm::SmallString<261> path; // MAX_PATH + 1

lib/Driver/UnixToolChains.cpp

@@ -324,6 +324,8 @@ toolchains::GenericUnix::constructInvocation(const DynamicLinkJobAction &job,
     Arguments.push_back(
         context.Args.MakeArgString(Twine("-stdlib=") + A->getValue()));
   }
+  if (getTriple().isOSLinux())
+    Arguments.push_back("-lstdc++");
 
   // Explicitly pass the target to the linker
   Arguments.push_back(

lib/IRGen/GenClangDecl.cpp

@@ -86,15 +86,15 @@ class ClangDeclFinder
 // the initializer of the variable.
 clang::Decl *getDeclWithExecutableCode(clang::Decl *decl) {
   if (auto fd = dyn_cast<clang::FunctionDecl>(decl)) {
-    // If this is a potentially not-yet-instanciated template, we might
-    // still have a body.
-    if (fd->getTemplateInstantiationPattern())
-      return fd;
-
     const clang::FunctionDecl *definition;
     if (fd->hasBody(definition)) {
       return const_cast<clang::FunctionDecl *>(definition);
     }
+
+    // If this is a potentially not-yet-instanciated template, we might
+    // still have a body.
+    if (fd->getTemplateInstantiationPattern())
+      return fd;
   } else if (auto vd = dyn_cast<clang::VarDecl>(decl)) {
     clang::VarDecl *initializingDecl = vd->getInitializingDeclaration();
     if (initializingDecl) {
@@ -120,6 +120,9 @@ void IRGenModule::emitClangDecl(const clang::Decl *decl) {
   if (getDeclWithExecutableCode(const_cast<clang::Decl *>(decl)) == nullptr) {
     ClangCodeGen->HandleTopLevelDecl(
                           clang::DeclGroupRef(const_cast<clang::Decl*>(decl)));
+    llvm::errs() << "SKIPPING code\n";
+    decl->dump(llvm::errs());
+    llvm::errs() << "===============";
     return;
   }
 
@@ -159,12 +162,26 @@ void IRGenModule::emitClangDecl(const clang::Decl *decl) {
       if (fn->getTemplateInstantiationPattern())
         Context.getClangModuleLoader()
             ->getClangSema()
-            .InstantiateFunctionDefinition(fn->getLocation(), fn);
+            .InstantiateFunctionDefinition(fn->getLocation(), fn, true);
     }
 
     if (clang::Decl *executableDecl = getDeclWithExecutableCode(next)) {
+        llvm::errs() << "TraverseDecl for:\n";
+        executableDecl->dump(llvm::errs());
+        llvm::errs() << "================\n";
+        if (auto nd = dyn_cast<clang::NamedDecl>(executableDecl)) {
+          if (nd->getIdentifier() && nd->getName() == "_M_destroy") {
+            llvm::errs() << "!!! emit _M_destroy while called with\n";
+            decl->dump(llvm::errs());
+            llvm::errs() << "!!! =================================\n";
+          }
+        }
         refFinder.TraverseDecl(executableDecl);
         next = executableDecl;
+    } else {
+      llvm::errs() << "!!! Skipping \n";
+      next->dump(llvm::errs());
+      llvm::errs() << "===============\n";
     }
 
     // Unfortunately, implicitly defined CXXDestructorDecls don't have a real

lib/IRGen/GenStruct.cpp

@@ -604,6 +604,9 @@ namespace {
         IRGenFunction &IGF, SILType T,
         const clang::CXXConstructorDecl *copyConstructor, llvm::Value *src,
         llvm::Value *dest) const {
+      llvm::errs() << "emitCopyWithCopyConstructor:\n";
+      copyConstructor->dump(llvm::errs());
+      llvm::errs() << "===========================\n";
       auto fnType = createCXXCopyConstructorFunctionType(IGF, T);
       auto globalDecl =
           clang::GlobalDecl(copyConstructor, clang::Ctor_Complete);

stdlib/public/Cxx/libstdcxx.h

@@ -1,8 +1,10 @@
 #include <algorithm>
 #include <bitset>
+#include <bits/stl_iterator_base_types.h>
 #include <complex>
 #include <deque>
 #include <exception>
+#include <ext/type_traits.h>
 #include <fstream>
 #include <functional>
 #include <iomanip>

test/Interop/Cxx/stdlib/use-std-string.swift

@@ -1,4 +1,4 @@
-// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-cxx-interop)
+// RUN: %target-run-simple-swift(-I %S/Inputs -Xfrontend -enable-cxx-interop -v -Xcc -v)
 //
 // REQUIRES: executable_test
 //