Merge pull request #77923 from kubamracek/embedded-mangling3

[embedded] Start using a new mangling prefix for Embedded Swift: $e

Author: kubamracek

lib/Basic/Mangler.cpp

@@ -123,7 +123,6 @@ void Mangler::beginManglingWithoutPrefix() {
 void Mangler::beginMangling() {
   beginManglingWithoutPrefix();
 
-#if 0 // STAGING: To be switched over to soon.
   switch (Flavor) {
   case ManglingFlavor::Default:
     Buffer << MANGLING_PREFIX_STR;
@@ -132,9 +131,6 @@ void Mangler::beginMangling() {
     Buffer << MANGLING_PREFIX_EMBEDDED_STR;
     break;
   }
-#else
-  Buffer << MANGLING_PREFIX_STR;
-#endif
 }
 
 /// Finish the mangling of the symbol and return the mangled name.
@@ -144,7 +140,6 @@ std::string Mangler::finalize() {
   Storage.clear();
 
 #ifndef NDEBUG
-#if 0 // STAGING: To be switched over to soon.
   switch (Flavor) {
   case ManglingFlavor::Default:
     if (StringRef(result).starts_with(MANGLING_PREFIX_STR))
@@ -155,10 +150,6 @@ std::string Mangler::finalize() {
       verify(result, Flavor);
     break;
   }
-#else
-  if (StringRef(result).starts_with(MANGLING_PREFIX_STR))
-    verify(result, Flavor);
-#endif
 #endif
 
   return result;
@@ -193,7 +184,6 @@ void Mangler::verify(StringRef nameStr, ManglingFlavor Flavor) {
     // It should be kept in sync.
     assert(StringRef(MANGLING_PREFIX_STR) != "_S" && "redundant check");
 
-#if 0 // STAGING: To be switched over to soon.
     switch (Flavor) {
     case ManglingFlavor::Default:
       buffer += MANGLING_PREFIX_STR;
@@ -202,9 +192,6 @@ void Mangler::verify(StringRef nameStr, ManglingFlavor Flavor) {
       buffer += MANGLING_PREFIX_EMBEDDED_STR;
       break;
     }
-#else
-    buffer += MANGLING_PREFIX_STR;
-#endif
 
     buffer += nameStr;
     nameStr = buffer.str();

lib/Demangling/Remangler.cpp

@@ -1795,7 +1795,6 @@ ManglingError Remangler::mangleGetter(Node *node, unsigned depth) {
 }
 
 ManglingError Remangler::mangleGlobal(Node *node, unsigned depth) {
-#if 0 // STAGING: To be switched over to soon.
   switch (Flavor) {
   case ManglingFlavor::Default:
     Buffer << MANGLING_PREFIX_STR;
@@ -1804,9 +1803,6 @@ ManglingError Remangler::mangleGlobal(Node *node, unsigned depth) {
     Buffer << MANGLING_PREFIX_EMBEDDED_STR;
     break;
   }
-#else
-  Buffer << MANGLING_PREFIX_STR;
-#endif
   bool mangleInReverseOrder = false;
   for (auto Iter = node->begin(), End = node->end(); Iter != End; ++Iter) {
     Node *Child = *Iter;

test/embedded/accessor-unavailable.swift

@@ -19,5 +19,5 @@ struct Foo {
 let foo = Foo()
 let _ = foo[5]
 
-// CHECK: $s4main3FooVyS2icig
-// CHECK-NOT: $s4main3FooVyS2icis
+// CHECK: $e4main3FooVyS2icig
+// CHECK-NOT: $e4main3FooVyS2icis

test/embedded/array-zero-size-struct.swift

@@ -19,5 +19,5 @@ public func copy(_ a: inout [MyStruct]) {
   var a = a
 }
 
-// CHECK: define {{.*}}@"$s4mainAAyyF"
-// CHECK: define {{.*}}@"$s4main4copyyySayAA8MyStructVGzF"
+// CHECK: define {{.*}}@"$e4mainAAyyF"
+// CHECK: define {{.*}}@"$e4main4copyyySayAA8MyStructVGzF"

test/embedded/availability-code-removal.swift

@@ -22,4 +22,4 @@ public func test() -> any Player {
 }
 
 // CHECK-A: $s4main4testAA6Player_pyF
-// CHECK-B-NOT: $s4main4testAA6Player_pyF
+// CHECK-B-NOT: $e4main4testAA6Player_pyF

test/embedded/basic-irgen-no-stdlib.swift

@@ -23,13 +23,13 @@ public func main() {
   start(p: Concrete())
 }
 
-// CHECK-LABEL: define {{.*}}void @"$s4main8ConcreteVACycfC"()
+// CHECK-LABEL: define {{.*}}void @"$e4main8ConcreteVACycfC"()
 
-// CHECK-LABEL: define {{.*}}void @"$s4main5start1pyx_tAA6PlayerRzlFAA8ConcreteV_Tg5"()
+// CHECK-LABEL: define {{.*}}void @"$e4main5start1pyx_tAA6PlayerRzlFAA8ConcreteV_Tg5"()
 
-// CHECK-LABEL: define {{.*}}void @"$s4mainAAyyF"()
+// CHECK-LABEL: define {{.*}}void @"$e4mainAAyyF"()
 // CHECK-NEXT:  entry:
-// CHECK-NEXT:    call swiftcc void @"$s4main8ConcreteVACycfC"()
-// CHECK-NEXT:    call swiftcc void @"$s4main5start1pyx_tAA6PlayerRzlFAA8ConcreteV_Tg5"()
+// CHECK-NEXT:    call swiftcc void @"$e4main8ConcreteVACycfC"()
+// CHECK-NEXT:    call swiftcc void @"$e4main5start1pyx_tAA6PlayerRzlFAA8ConcreteV_Tg5"()
 // CHECK-NEXT:    ret void
 // CHECK-NEXT:  }

test/embedded/basic-modules-generics-no-stdlib.swift

@@ -53,11 +53,11 @@ public func main() {
 }
 
 // CHECK: define {{.*}}i32 @main(i32 %0, ptr %1)
-// CHECK: define {{.*}}void @"$s4Main4BoolVACycfC"()
-// CHECK: define {{.*}}void @"$s4Main4mainyyF"()
-// CHECK: define {{.*}}void @"$s8MyModule14nonGenericFuncyyF"()
-// CHECK: define {{.*}}void @"$s8MyModule11genericFuncyxxlF4Main4BoolV_Tg5"()
-// CHECK: define {{.*}}void @"$s8MyModule14NonGenericTypeVACycfC"()
-// CHECK: define {{.*}}void @"$s8MyModule11GenericTypeVyACyxGxcfC4Main4BoolV_Tt1g5"()
-// CHECK: define {{.*}}void @"$s8MyModule17protocolBoundFuncyyxAA8ProtocolRzlF4Main4BoolV_Tg5"()
-// CHECK: define {{.*}}void @"$s8MyModule17protocolBoundFuncyyxAA8ProtocolRzlFAA11GenericTypeVy4Main4BoolVG_Tg5"()
+// CHECK: define {{.*}}void @"$e4Main4BoolVACycfC"()
+// CHECK: define {{.*}}void @"$e4Main4mainyyF"()
+// CHECK: define {{.*}}void @"$e8MyModule14nonGenericFuncyyF"()
+// CHECK: define {{.*}}void @"$e8MyModule11genericFuncyxxlF4Main4BoolV_Tg5"()
+// CHECK: define {{.*}}void @"$e8MyModule14NonGenericTypeVACycfC"()
+// CHECK: define {{.*}}void @"$e8MyModule11GenericTypeVyACyxGxcfC4Main4BoolV_Tt1g5"()
+// CHECK: define {{.*}}void @"$e8MyModule17protocolBoundFuncyyxAA8ProtocolRzlF4Main4BoolV_Tg5"()
+// CHECK: define {{.*}}void @"$e8MyModule17protocolBoundFuncyyxAA8ProtocolRzlFAA11GenericTypeVy4Main4BoolVG_Tg5"()

test/embedded/basic-modules-no-stdlib.swift

@@ -39,8 +39,8 @@ public func main() {
 }
 
 // CHECK: define {{.*}}@main{{.*}} {
-// CHECK: define {{.*}}void @"$s4Main4mainyyF"{{.*}} {
-// CHECK: define {{.*}}void @"$s8MyModule10moduleMainyyF"{{.*}} {
-// CHECK: define {{.*}}void @"$s8MyModule8ConcreteVACycfC"{{.*}} {
-// CHECK: define {{.*}}void @"$s8MyModule5start1pyx_tAA6PlayerRzlFAA8ConcreteV_Tg5"{{.*}} {
-// CHECK: define {{.*}}void @"$s8MyModule8ConcreteV4playyyF"{{.*}} {
+// CHECK: define {{.*}}void @"$e4Main4mainyyF"{{.*}} {
+// CHECK: define {{.*}}void @"$e8MyModule10moduleMainyyF"{{.*}} {
+// CHECK: define {{.*}}void @"$e8MyModule8ConcreteVACycfC"{{.*}} {
+// CHECK: define {{.*}}void @"$e8MyModule5start1pyx_tAA6PlayerRzlFAA8ConcreteV_Tg5"{{.*}} {
+// CHECK: define {{.*}}void @"$e8MyModule8ConcreteV4playyyF"{{.*}} {

test/embedded/builtins-misc.swift

@@ -13,7 +13,7 @@ public func foo() -> Builtin.Int1 {
   return Builtin.ispod(MyStruct.self)
 }
 
-// CHECK:      define {{.*}}i1 @"$ss3fooBi1_yF"()
+// CHECK:      define {{.*}}i1 @"$es3fooBi1_yF"()
 // CHECK-NEXT: entry:
 // CHECK-NEXT:   ret i1 false
 // CHECK-NEXT: }
@@ -29,7 +29,7 @@ public struct MyGenericStruct<T> {
   }
 }
 
-// CHECK:      define {{.*}}i1 @"$ss15MyGenericStructV3fooBi1_yFs0aC0V_Tg5"()
+// CHECK:      define {{.*}}i1 @"$es15MyGenericStructV3fooBi1_yFs0aC0V_Tg5"()
 // CHECK-NEXT: entry:
 // CHECK-NEXT:   ret i1 false
 // CHECK-NEXT: }

test/embedded/classes-generic-no-stdlib.swift

@@ -22,49 +22,49 @@ public func bar(t: T2) -> MyClass<T2> {
   return MyClass<T2>(t: t)
 }
 
-// CHECK-SIL-DAG: sil {{.*}}@$s4main7MyClassC1txvgAA2T1V_Tg5 {{.*}}{
-// CHECK-SIL-DAG: sil {{.*}}@$s4main7MyClassC1txvsAA2T1V_Tg5 {{.*}}{
-// CHECK-SIL-DAG: sil {{.*}}@$s4main7MyClassC1txvMAA2T1V_Tg5 {{.*}}{
-// CHECK-SIL-DAG: sil {{.*}}@$s4main7MyClassC1tACyxGx_tcfCAA2T1V_Tt0g5 {{.*}}{
-// CHECK-SIL-DAG: sil {{.*}}@$s4main7MyClassCfDAA2T1V_Tg5 {{.*}}{
+// CHECK-SIL-DAG: sil {{.*}}@$e4main7MyClassC1txvgAA2T1V_Tg5 {{.*}}{
+// CHECK-SIL-DAG: sil {{.*}}@$e4main7MyClassC1txvsAA2T1V_Tg5 {{.*}}{
+// CHECK-SIL-DAG: sil {{.*}}@$e4main7MyClassC1txvMAA2T1V_Tg5 {{.*}}{
+// CHECK-SIL-DAG: sil {{.*}}@$e4main7MyClassC1tACyxGx_tcfCAA2T1V_Tt0g5 {{.*}}{
+// CHECK-SIL-DAG: sil {{.*}}@$e4main7MyClassCfDAA2T1V_Tg5 {{.*}}{
 
-// CHECK-SIL-DAG: sil {{.*}}@$s4main7MyClassC1txvgAA2T2V_Tg5 {{.*}}{
-// CHECK-SIL-DAG: sil {{.*}}@$s4main7MyClassC1txvsAA2T2V_Tg5 {{.*}}{
-// CHECK-SIL-DAG: sil {{.*}}@$s4main7MyClassC1txvMAA2T2V_Tg5 {{.*}}{
-// CHECK-SIL-DAG: sil {{.*}}@$s4main7MyClassC1tACyxGx_tcfCAA2T2V_Tt0g5 {{.*}}{
-// CHECK-SIL-DAG: sil {{.*}}@$s4main7MyClassCfDAA2T2V_Tg5 {{.*}}{
+// CHECK-SIL-DAG: sil {{.*}}@$e4main7MyClassC1txvgAA2T2V_Tg5 {{.*}}{
+// CHECK-SIL-DAG: sil {{.*}}@$e4main7MyClassC1txvsAA2T2V_Tg5 {{.*}}{
+// CHECK-SIL-DAG: sil {{.*}}@$e4main7MyClassC1txvMAA2T2V_Tg5 {{.*}}{
+// CHECK-SIL-DAG: sil {{.*}}@$e4main7MyClassC1tACyxGx_tcfCAA2T2V_Tt0g5 {{.*}}{
+// CHECK-SIL-DAG: sil {{.*}}@$e4main7MyClassCfDAA2T2V_Tg5 {{.*}}{
 
 // CHECK-SIL: sil_vtable MyClass {
-// CHECK-SIL:   #MyClass.t!getter: <T> (MyClass<T>) -> () -> T : @$s4main7MyClassC1txvgAA2T1V_Tg5 // specialized MyClass.t.getter
-// CHECK-SIL:   #MyClass.t!setter: <T> (MyClass<T>) -> (T) -> () : @$s4main7MyClassC1txvsAA2T1V_Tg5 // specialized MyClass.t.setter
-// CHECK-SIL:   #MyClass.t!modify: <T> (MyClass<T>) -> () -> () : @$s4main7MyClassC1txvMAA2T1V_Tg5  // specialized MyClass.t.modify
-// CHECK-SIL:   #MyClass.init!allocator: <T> (MyClass<T>.Type) -> (T) -> MyClass<T> : @$s4main7MyClassC1tACyxGx_tcfCAA2T1V_Tg5  // specialized MyClass.__allocating_init(t:)
-// CHECK-SIL:   #MyClass.deinit!deallocator: @$s4main7MyClassCfDAA2T1V_Tg5  // specialized MyClass.__deallocating_deinit
+// CHECK-SIL:   #MyClass.t!getter: <T> (MyClass<T>) -> () -> T : @$e4main7MyClassC1txvgAA2T1V_Tg5 // specialized MyClass.t.getter
+// CHECK-SIL:   #MyClass.t!setter: <T> (MyClass<T>) -> (T) -> () : @$e4main7MyClassC1txvsAA2T1V_Tg5 // specialized MyClass.t.setter
+// CHECK-SIL:   #MyClass.t!modify: <T> (MyClass<T>) -> () -> () : @$e4main7MyClassC1txvMAA2T1V_Tg5  // specialized MyClass.t.modify
+// CHECK-SIL:   #MyClass.init!allocator: <T> (MyClass<T>.Type) -> (T) -> MyClass<T> : @$e4main7MyClassC1tACyxGx_tcfCAA2T1V_Tg5  // specialized MyClass.__allocating_init(t:)
+// CHECK-SIL:   #MyClass.deinit!deallocator: @$e4main7MyClassCfDAA2T1V_Tg5  // specialized MyClass.__deallocating_deinit
 // CHECK-SIL: }
 
 // CHECK-SIL: sil_vtable $MyClass<T2> {
-// CHECK-SIL:   #MyClass.t!getter: <T> (MyClass<T>) -> () -> T : @$s4main7MyClassC1txvgAA2T2V_Tg5 // specialized MyClass.t.getter
-// CHECK-SIL:   #MyClass.t!setter: <T> (MyClass<T>) -> (T) -> () : @$s4main7MyClassC1txvsAA2T2V_Tg5 // specialized MyClass.t.setter
-// CHECK-SIL:   #MyClass.t!modify: <T> (MyClass<T>) -> () -> () : @$s4main7MyClassC1txvMAA2T2V_Tg5  // specialized MyClass.t.modify
-// CHECK-SIL:   #MyClass.init!allocator: <T> (MyClass<T>.Type) -> (T) -> MyClass<T> : @$s4main7MyClassC1tACyxGx_tcfCAA2T2V_Tg5  // specialized MyClass.__allocating_init(t:)
-// CHECK-SIL:   #MyClass.deinit!deallocator: @$s4main7MyClassCfDAA2T2V_Tg5  // specialized MyClass.__deallocating_deinit
+// CHECK-SIL:   #MyClass.t!getter: <T> (MyClass<T>) -> () -> T : @$e4main7MyClassC1txvgAA2T2V_Tg5 // specialized MyClass.t.getter
+// CHECK-SIL:   #MyClass.t!setter: <T> (MyClass<T>) -> (T) -> () : @$e4main7MyClassC1txvsAA2T2V_Tg5 // specialized MyClass.t.setter
+// CHECK-SIL:   #MyClass.t!modify: <T> (MyClass<T>) -> () -> () : @$e4main7MyClassC1txvMAA2T2V_Tg5  // specialized MyClass.t.modify
+// CHECK-SIL:   #MyClass.init!allocator: <T> (MyClass<T>.Type) -> (T) -> MyClass<T> : @$e4main7MyClassC1tACyxGx_tcfCAA2T2V_Tg5  // specialized MyClass.__allocating_init(t:)
+// CHECK-SIL:   #MyClass.deinit!deallocator: @$e4main7MyClassCfDAA2T2V_Tg5  // specialized MyClass.__deallocating_deinit
 // CHECK-SIL: }
 
 
-// CHECK-IR: @"$s4main7MyClassCyAA2T2VGN" = {{.*}}<{ ptr, ptr, ptr, ptr, ptr, ptr, ptr }> <{ ptr null, ptr @"$s4main7MyClassCfDAA2T2V_Tg5", ptr null, ptr @"$s4main7MyClassC1txvgAA2T2V_Tg5", ptr @"$s4main7MyClassC1txvsAA2T2V_Tg5", ptr @"$s4main7MyClassC1txvMAA2T2V_Tg5", ptr @"$s4main7MyClassC1tACyxGx_tcfCAA2T2V_Tg5" }>
-// CHECK-IR: @"$s4main7MyClassCyAA2T1VGN" = {{.*}}<{ ptr, ptr, ptr, ptr, ptr, ptr, ptr }> <{ ptr null, ptr @"$s4main7MyClassCfDAA2T1V_Tg5", ptr null, ptr @"$s4main7MyClassC1txvgAA2T1V_Tg5", ptr @"$s4main7MyClassC1txvsAA2T1V_Tg5", ptr @"$s4main7MyClassC1txvMAA2T1V_Tg5", ptr @"$s4main7MyClassC1tACyxGx_tcfCAA2T1V_Tg5" }>
+// CHECK-IR: @"$e4main7MyClassCyAA2T2VGN" = {{.*}}<{ ptr, ptr, ptr, ptr, ptr, ptr, ptr }> <{ ptr null, ptr @"$e4main7MyClassCfDAA2T2V_Tg5", ptr null, ptr @"$e4main7MyClassC1txvgAA2T2V_Tg5", ptr @"$e4main7MyClassC1txvsAA2T2V_Tg5", ptr @"$e4main7MyClassC1txvMAA2T2V_Tg5", ptr @"$e4main7MyClassC1tACyxGx_tcfCAA2T2V_Tg5" }>
+// CHECK-IR: @"$e4main7MyClassCyAA2T1VGN" = {{.*}}<{ ptr, ptr, ptr, ptr, ptr, ptr, ptr }> <{ ptr null, ptr @"$e4main7MyClassCfDAA2T1V_Tg5", ptr null, ptr @"$e4main7MyClassC1txvgAA2T1V_Tg5", ptr @"$e4main7MyClassC1txvsAA2T1V_Tg5", ptr @"$e4main7MyClassC1txvMAA2T1V_Tg5", ptr @"$e4main7MyClassC1tACyxGx_tcfCAA2T1V_Tg5" }>
 
-// CHECK-IR-DAG: define {{.*}}void @"$s4main7MyClassC1txvgAA2T1V_Tg5"(ptr swiftself %0)
-// CHECK-IR-DAG: define {{.*}}i1 @"$s4main7MyClassC1txvgAA2T2V_Tg5"(ptr swiftself %0)
-// CHECK-IR-DAG: define {{.*}}ptr @"$s4main7MyClassC1tACyxGx_tcfCAA2T1V_Tg5"(ptr swiftself %0)
-// CHECK-IR-DAG: define {{.*}}ptr @"$s4main7MyClassC1tACyxGx_tcfCAA2T2V_Tg5"(i1 %0, ptr swiftself %1)
-// CHECK-IR-DAG: define {{.*}}ptr @"$s4main7MyClassC1tACyxGx_tcfCAA2T1V_Tt0g5"()
-// CHECK-IR-DAG: define {{.*}}ptr @"$s4main7MyClassC1tACyxGx_tcfCAA2T2V_Tt0g5"(i1 %0)
-// CHECK-IR-DAG: define {{.*}}ptr @"$s4main7MyClassC1tACyxGx_tcfcAA2T1V_Tg5"(ptr swiftself %0)
-// CHECK-IR-DAG: define {{.*}}ptr @"$s4main7MyClassC1tACyxGx_tcfcAA2T2V_Tg5"(i1 %0, ptr swiftself %1)
-// CHECK-IR-DAG: define {{.*}}ptr @"$s4main7MyClassCfdAA2T1V_Tg5"(ptr swiftself %0)
-// CHECK-IR-DAG: define {{.*}}ptr @"$s4main7MyClassCfdAA2T2V_Tg5"(ptr swiftself %0)
-// CHECK-IR-DAG: define {{.*}}void @"$s4main7MyClassCfDAA2T1V_Tg5"(ptr swiftself %0)
-// CHECK-IR-DAG: define {{.*}}void @"$s4main7MyClassCfDAA2T2V_Tg5"(ptr swiftself %0)
-// CHECK-IR-DAG: define {{.*}}ptr @"$s4main3foo1tAA7MyClassCyAA2T1VGAG_tF"()
-// CHECK-IR-DAG: define {{.*}}ptr @"$s4main3bar1tAA7MyClassCyAA2T2VGAG_tF"(i1 %0)
+// CHECK-IR-DAG: define {{.*}}void @"$e4main7MyClassC1txvgAA2T1V_Tg5"(ptr swiftself %0)
+// CHECK-IR-DAG: define {{.*}}i1 @"$e4main7MyClassC1txvgAA2T2V_Tg5"(ptr swiftself %0)
+// CHECK-IR-DAG: define {{.*}}ptr @"$e4main7MyClassC1tACyxGx_tcfCAA2T1V_Tg5"(ptr swiftself %0)
+// CHECK-IR-DAG: define {{.*}}ptr @"$e4main7MyClassC1tACyxGx_tcfCAA2T2V_Tg5"(i1 %0, ptr swiftself %1)
+// CHECK-IR-DAG: define {{.*}}ptr @"$e4main7MyClassC1tACyxGx_tcfCAA2T1V_Tt0g5"()
+// CHECK-IR-DAG: define {{.*}}ptr @"$e4main7MyClassC1tACyxGx_tcfCAA2T2V_Tt0g5"(i1 %0)
+// CHECK-IR-DAG: define {{.*}}ptr @"$e4main7MyClassC1tACyxGx_tcfcAA2T1V_Tg5"(ptr swiftself %0)
+// CHECK-IR-DAG: define {{.*}}ptr @"$e4main7MyClassC1tACyxGx_tcfcAA2T2V_Tg5"(i1 %0, ptr swiftself %1)
+// CHECK-IR-DAG: define {{.*}}ptr @"$e4main7MyClassCfdAA2T1V_Tg5"(ptr swiftself %0)
+// CHECK-IR-DAG: define {{.*}}ptr @"$e4main7MyClassCfdAA2T2V_Tg5"(ptr swiftself %0)
+// CHECK-IR-DAG: define {{.*}}void @"$e4main7MyClassCfDAA2T1V_Tg5"(ptr swiftself %0)
+// CHECK-IR-DAG: define {{.*}}void @"$e4main7MyClassCfDAA2T2V_Tg5"(ptr swiftself %0)
+// CHECK-IR-DAG: define {{.*}}ptr @"$e4main3foo1tAA7MyClassCyAA2T1VGAG_tF"()
+// CHECK-IR-DAG: define {{.*}}ptr @"$e4main3bar1tAA7MyClassCyAA2T2VGAG_tF"(i1 %0)