Merge pull request swiftlang#22088 from slavapestov/demangle-float-type

Demangler: Print BuiltinFloatType as "FPIEEE<size>" not "Float<size>"

Author: slavapestov

include/swift/Strings.h

@@ -58,7 +58,7 @@ constexpr static const char BUILTIN_TYPE_NAME_INT512[] = "Builtin.Int512";
 constexpr static const char BUILTIN_TYPE_NAME_INTLITERAL[] =
     "Builtin.IntLiteral";
 /// The name of the Builtin type for Float
-constexpr static const char BUILTIN_TYPE_NAME_FLOAT[] = "Builtin.Float";
+constexpr static const char BUILTIN_TYPE_NAME_FLOAT[] = "Builtin.FPIEEE";
 /// The name of the Builtin type for NativeObject
 constexpr static const char BUILTIN_TYPE_NAME_NATIVEOBJECT[] =
     "Builtin.NativeObject";

lib/Demangling/OldDemangler.cpp

@@ -1810,7 +1810,7 @@ class OldDemangler {
         if (demangleBuiltinSize(size)) {
           return Factory.createNode(
               Node::Kind::BuiltinTypeName,
-              std::move(DemanglerPrinter() << "Builtin.Float" << size).str());
+              std::move(DemanglerPrinter() << "Builtin.FPIEEE" << size).str());
         }
       }
       if (c == 'i') {

lib/Demangling/OldRemangler.cpp

@@ -1350,7 +1350,7 @@ void Remangler::mangleBuiltinTypeName(Node *node) {
     Out << 'w';
   } else if (stripPrefix(text, "Builtin.Int")) {
     Out << 'i' << text << '_';
-  } else if (stripPrefix(text, "Builtin.Float")) {
+  } else if (stripPrefix(text, "Builtin.FPIEEE")) {
     Out << 'f' << text << '_';
   } else if (stripPrefix(text, "Builtin.Vec")) {
     // Avoid using StringRef::split because its definition is not

lib/Demangling/Remangler.cpp

@@ -709,7 +709,7 @@ void Remangler::mangleBuiltinTypeName(Node *node) {
     auto element = text.substr(splitIdx).substr(1);
     if (element == "RawPointer") {
       Buffer << 'p';
-    } else if (element.consume_front("Float")) {
+    } else if (element.consume_front("FPIEEE")) {
       Buffer << 'f' << element << '_';
     } else if (element.consume_front("Int")) {
       Buffer << 'i' << element << '_';

test/Demangle/Inputs/manglings.txt

@@ -1,5 +1,11 @@
-_TtBf80_ ---> Builtin.Float80
+_TtBf32_ ---> Builtin.FPIEEE32
+_TtBf64_ ---> Builtin.FPIEEE64
+_TtBf80_ ---> Builtin.FPIEEE80
 _TtBi32_ ---> Builtin.Int32
+$sBf32_ ---> Builtin.FPIEEE32
+$sBf64_ ---> Builtin.FPIEEE64
+$sBf80_ ---> Builtin.FPIEEE80
+$sBi32_ ---> Builtin.Int32
 _TtBw ---> Builtin.Word
 _TtBO ---> Builtin.UnknownObject
 _TtBo ---> Builtin.NativeObject

test/Demangle/Inputs/simplified-manglings.txt

@@ -1,4 +1,4 @@
-_TtBf80_ ---> Builtin.Float80
+_TtBf80_ ---> Builtin.FPIEEE80
 _TtBi32_ ---> Builtin.Int32
 _TtBw ---> Builtin.Word
 _TtBO ---> Builtin.UnknownObject

test/SourceKit/Demangle/demangle.swift

@@ -1,15 +1,15 @@
 // RUN: %sourcekitd-test -req=demangle unmangled _TtBf80_  _TtP3foo3bar_ '$s3Foo11AppDelegateC29applicationDidFinishLaunchingyy10Foundation12NotificationVF' | %FileCheck %s
 // CHECK:      START DEMANGLE
 // CHECK-NEXT: <empty>
-// CHECK-NEXT: Builtin.Float80
+// CHECK-NEXT: Builtin.FPIEEE80
 // CHECK-NEXT: foo.bar
 // CHECK-NEXT: Foo.AppDelegate.applicationDidFinishLaunching(Foundation.Notification) -> ()
 // CHECK-NEXT: END DEMANGLE
 
 // RUN: %sourcekitd-test -req=demangle unmangled _TtBf80_  _TtP3foo3bar_ '$s3Foo11AppDelegateC29applicationDidFinishLaunchingyy10Foundation12NotificationVF' -simplified-demangling | %FileCheck %s -check-prefix=SIMPLIFIED
 // SIMPLIFIED:      START DEMANGLE
 // SIMPLIFIED-NEXT: <empty>
-// SIMPLIFIED-NEXT: Builtin.Float80
+// SIMPLIFIED-NEXT: Builtin.FPIEEE80
 // SIMPLIFIED-NEXT: bar
 // SIMPLIFIED-NEXT: AppDelegate.applicationDidFinishLaunching(_:)
 // SIMPLIFIED-NEXT: END DEMANGLE