Merge pull request #37379 from compnerd/cxx-interop-5.4

Backport some fixes for C++ interop tests on 5.4

Author: shahmishal

lib/ClangImporter/ClangImporter.cpp

@@ -520,21 +520,44 @@ importer::getNormalInvocationArguments(
     invocationArgStrs.push_back(
         "-Werror=non-modular-include-in-framework-module");
 
+  bool EnableCXXInterop = LangOpts.EnableCXXInterop;
+
   if (LangOpts.EnableObjCInterop) {
-    bool EnableCXXInterop = LangOpts.EnableCXXInterop;
-    invocationArgStrs.insert(
-        invocationArgStrs.end(),
-        {"-x", EnableCXXInterop ? "objective-c++" : "objective-c",
-         EnableCXXInterop ? "-std=gnu++17" : "-std=gnu11", "-fobjc-arc"});
+    invocationArgStrs.insert(invocationArgStrs.end(), {"-fobjc-arc"});
     // TODO: Investigate whether 7.0 is a suitable default version.
     if (!triple.isOSDarwin())
       invocationArgStrs.insert(invocationArgStrs.end(),
                                {"-fobjc-runtime=ios-7.0"});
+    invocationArgStrs.insert(invocationArgStrs.end(), {
+      "-x", EnableCXXInterop ? "objective-c++" : "objective-c"
+    });
   } else {
-    bool EnableCXXInterop = LangOpts.EnableCXXInterop;
-    invocationArgStrs.insert(invocationArgStrs.end(),
-                             {"-x", EnableCXXInterop ? "c++" : "c",
-                              EnableCXXInterop ? "-std=gnu++17" : "-std=gnu11"});
+    invocationArgStrs.insert(invocationArgStrs.end(), {
+      "-x", EnableCXXInterop ? "c++" : "c"
+    });
+  }
+
+  {
+    const clang::LangStandard &stdcxx =
+#if defined(CLANG_DEFAULT_STD_CXX)
+        *clang::LangStandard::getLangStandardForName(CLANG_DEFAULT_STD_CXX);
+#else
+        clang::LangStandard::getLangStandardForKind(
+            clang::LangStandard::lang_gnucxx14);
+#endif
+
+    const clang::LangStandard &stdc =
+#if defined(CLANG_DEFAULT_STD_C)
+        *clang::LangStandard::getLangStandardForName(CLANG_DEFAULT_STD_C);
+#else
+        clang::LangStandard::getLangStandardForKind(
+            clang::LangStandard::lang_gnu11);
+#endif
+
+    invocationArgStrs.insert(invocationArgStrs.end(), {
+      (Twine("-std=") + StringRef(EnableCXXInterop ? stdcxx.getName()
+                                                   : stdc.getName())).str()
+    });
   }
 
   // Set C language options.

test/ClangImporter/cxx_interop.swift

@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-frontend -typecheck %s -I %S/Inputs/custom-modules -module-cache-path %t -enable-cxx-interop
+// RUN: %target-swiftxx-frontend -typecheck %s -I %S/Inputs/custom-modules
 
 import CXXInterop
 

test/ClangImporter/cxx_interop_ir.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -module-name cxx_ir -I %S/Inputs/custom-modules -module-cache-path %t -enable-cxx-interop -emit-ir -o - -primary-file %s | %FileCheck %s
+// RUN: %target-swiftxx-frontend -module-name cxx_ir -I %S/Inputs/custom-modules -emit-ir -o - -primary-file %s | %FileCheck %s
 
 import CXXInterop
 

test/ClangImporter/enum-cxx.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -emit-ir -primary-file %s -I %S/Inputs/custom-modules -module-cache-path %t -enable-cxx-interop -o - | %FileCheck %s
+// RUN: %target-swiftxx-frontend -emit-ir -primary-file %s -I %S/Inputs/custom-modules -o - | %FileCheck %s
 
 import CXXInterop
 

test/Interop/C/function/emit-called-inline-function-irgen.swift

@@ -6,7 +6,7 @@
 
 // RUN: %empty-directory(%t)
 // RUN: %target-swift-frontend %s -I %S/Inputs -Xcc -std=c99 -emit-ir -o - | %FileCheck %s -check-prefix C99 --implicit-check-not notCalled
-// RUN: %target-swift-frontend %s -I %S/Inputs -enable-cxx-interop -emit-ir -o - | %FileCheck %s -check-prefix CXX --implicit-check-not notCalled
+// RUN: %target-swiftxx-frontend %s -I %S/Inputs -emit-ir -o - | %FileCheck %s -check-prefix CXX --implicit-check-not notCalled
 
 import EmitCalledInlineFunction
 

test/Interop/Cxx/class/Inputs/module.modulemap

@@ -1,47 +1,59 @@
 module AccessSpecifiers {
   header "access-specifiers.h"
+  requires cplusplus
 }
 
 module TypeClassification {
   header "type-classification.h"
+  requires cplusplus
 }
 
 module Constructors {
   header "constructors.h"
+  requires cplusplus
 }
 
 module ConstructorsObjC {
   header "constructors-objc.h"
+  requires cplusplus
 }
 
 module LoadableTypes {
   header "loadable-types.h"
+  requires cplusplus
 }
 
 module MemberwiseInitializer {
   header "memberwise-initializer.h"
+  requires cplusplus
 }
 
 module MemoryLayout {
   header "memory-layout.h"
+  requires cplusplus
 }
 
 module MemberVariables {
   header "member-variables.h"
+  requires cplusplus
 }
 
 module ProtocolConformance {
   header "protocol-conformance.h"
+  requires cplusplus
 }
 
 module SynthesizedInitializers {
   header "synthesized-initializers.h"
+  requires cplusplus
 }
 
 module DebugInfo {
   header "debug-info.h"
+  requires cplusplus
 }
 
 module NestedRecords {
   header "nested-records.h"
+  requires cplusplus
 }

test/Interop/Cxx/class/constructors-silgen.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -I %S/Inputs -enable-cxx-interop -emit-silgen %s | %FileCheck %s
+// RUN: %target-swiftxx-frontend -I %S/Inputs -emit-silgen %s | %FileCheck %s
 
 import Constructors
 

test/Interop/Cxx/class/debug-info-irgen.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -enable-cxx-interop -I %S/Inputs %s -emit-ir -g | %FileCheck %s
+// RUN: %target-swiftxx-frontend -I %S/Inputs %s -emit-ir -g | %FileCheck %s
 
 // Validate that we don't crash when trying to deserialize C++ type debug info.
 // Note, however, that the actual debug info is not generated, see SR-13223.

test/Interop/Cxx/class/memory-layout-silgen.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -I %S/Inputs -enable-cxx-interop -emit-ir -o - %s | %FileCheck %s
+// RUN: %target-swiftxx-frontend -I %S/Inputs -emit-ir -o - %s | %FileCheck %s
 
 import MemoryLayout
 

test/Interop/Cxx/class/type-classification-non-trivial-irgen.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -enable-cxx-interop -I %S/Inputs %s -emit-ir | %FileCheck %s
+// RUN: %target-swiftxx-frontend -I %S/Inputs %s -emit-ir | %FileCheck %s
 
 // Verify that non-trival/address-only C++ classes are constructed and accessed
 // correctly. Make sure that we correctly IRGen functions that construct