Merge pull request #4927 from eeckstein/fix-linkage

Author: swift-ci

include/swift/SIL/SILFunction.h

@@ -358,6 +358,8 @@ class SILFunction
       case PublicClass:
         if (L == SILLinkage::Private || L == SILLinkage::Hidden)
           return SILLinkage::Public;
+        if (L == SILLinkage::PrivateExternal || L == SILLinkage::HiddenExternal)
+          return SILLinkage::PublicExternal;
         break;
     }
     return L;

test/IRGen/Inputs/vtable_symbol_linkage_base.swift

@@ -0,0 +1,12 @@
+
+open class Base {
+  private func privateFunc() -> Int {
+    return 27
+  }
+  internal func internalFunc() -> Int {
+    return 28
+  }
+
+  private var privateVar: Int = 29
+  internal var internalVar: Int = 30
+}

test/IRGen/vtable_symbol_linkage.swift

@@ -0,0 +1,12 @@
+// RUN: rm -rf %t && mkdir -p %t
+// RUN: %target-build-swift %S/Inputs/vtable_symbol_linkage_base.swift -emit-module -emit-module-path=%t/BaseModule.swiftmodule -emit-library -module-name BaseModule -o %t/BaseModule.%target-dylib-extension
+// RUN: %target-build-swift -I %t %s %t/BaseModule.%target-dylib-extension -o %t/a.out
+
+// Check if the program can be linked without undefined symbol errors.
+
+import BaseModule
+
+public class Derived : Base {
+}
+
+

test/Interpreter/use_public_var_private_setter.swift

@@ -1,10 +1,6 @@
 // RUN: %target-build-swift -emit-module -emit-library %S/Inputs/public_var_private_setter.swift
 // RUN: %target-build-swift -I . -L . -lpublic_var_private_setter %s -o use_public_var_private_setter
 
-// On Linux, the linker step of this test fails with "Bad value", specifically:
-// "hidden symbol `_TFC25public_var_private_setter9BaseClasscfT_S0_' isn't defined".
-// XFAIL: linux
-
 import public_var_private_setter
 
 class Class: BaseClass {}