Update mangling for 4.1

Author: aschwaighofer

test/multifile/require-layout-generic-arg-closure.swift

@@ -5,15 +5,15 @@
 
 // The offset of the typemetadata in the class typemetadata must match.
 
-// FILE1-LABEL: define internal swiftcc void @{{.*}}S4test12requestType{{.*}}(%T4test3SubC*)
+// FILE1-LABEL: define internal swiftcc void @{{.*}}4test12requestType{{.*}}(%T4test3SubC*)
 // FILE1: entry:
 // FILE1:   [[T1:%.*]] = bitcast %T4test3SubC* %0 to %swift.type**
 // FILE1:   [[TYPEMETADATA:%.*]] = load %swift.type*, %swift.type** [[T1]]
 // FILE1:   [[T2:%.*]] = bitcast %swift.type* [[TYPEMETADATA]] to %swift.type**
 // This offset of T needs to be the same as the offset below.
 // FILE1:   [[T_PTR:%.*]] = getelementptr inbounds %swift.type*, %swift.type** [[T2]], i64 16
 // FILE1:   [[T:%.*]] = load %swift.type*, %swift.type** [[T_PTR]]
-// FILE1:   call %swift.type* @{{.*}}S4test3SubCMa{{.*}}(%swift.type* [[T]])
+// FILE1:   call %swift.type* @{{.*}}4test3SubCMa{{.*}}(%swift.type* [[T]])
 
 public func requestType2<T>(x: T) {
   requestTypeThrough(closure: { x in print(x) }, arg: x)

test/multifile/require-layout-generic-arg-subscript.swift

@@ -5,7 +5,7 @@
 
 // The offset of the typemetadata in the class typemetadata must match.
 
-// FILE1: define hidden swiftcc i64 @{{.*}}S4test12AccessorTestCySiAA3Sub{{.*}}(%T4test3SubC*, %T4test12AccessorTestC* swiftself)
+// FILE1: define hidden swiftcc i64 @{{.*}}4test12AccessorTestCySiAA3Sub{{.*}}(%T4test3SubC*, %T4test12AccessorTestC* swiftself)
 // FILE1:   [[T1:%.*]] = bitcast %T4test3SubC* %0 to %swift.type**
 // FILE1:   [[TYPEMETADATA:%.*]] = load %swift.type*, %swift.type** [[T1]]
 // FILE1:   [[T2:%.*]] = bitcast %swift.type* [[TYPEMETADATA]] to %swift.type**

test/multifile/require-layout-generic-arg.swift

@@ -5,7 +5,7 @@
 
 // The offset of the typemetadata in the class typemetadata must match.
 
-// FILE1-LABEL: define{{.*}} swiftcc void @{{.*}}S4test11requestTypeyyAA3Sub{{.*}}(%T4test3SubC*)
+// FILE1-LABEL: define{{.*}} swiftcc void @{{.*}}4test11requestType{{.*}}(%T4test3SubC*)
 // FILE1:  [[T1:%.*]] = bitcast %T4test3SubC* %0 to %swift.type**
 // FILE1:  [[TYPEMETADATA:%.*]] = load %swift.type*, %swift.type** [[T1]]
 // FILE1:  [[T2:%.*]] = bitcast %swift.type* [[TYPEMETADATA]] to %swift.type**