Merge pull request #8295 from swiftix/wip-gsb-layout-constrains-fixes

[mangling] Define a mangling for _Class and _NativeClass layout constraints
swiftlang · Mar 23, 2017 · 415736b · 415736b
2 parents d90032c + e7503b1
commit 415736b
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 0 deletions.
diff --git a/docs/ABI.rst b/docs/ABI.rst
@@ -1173,6 +1173,8 @@ Property behaviors are implemented using private protocol conformances.
   LAYOUT-CONSTRAINT ::= 'N'  // NativeRefCountedObject 
   LAYOUT-CONSTRAINT ::= 'R'  // RefCountedObject 
   LAYOUT-CONSTRAINT ::= 'T'  // Trivial 
+  LAYOUT-CONSTRAINT ::= 'C'  // Class
+  LAYOUT-CONSTRAINT ::= 'D'  // NativeClass 
   LAYOUT-CONSTRAINT ::= 'E' LAYOUT-SIZE-AND-ALIGNMENT  // Trivial of exact size 
   LAYOUT-CONSTRAINT ::= 'e' LAYOUT-SIZE  // Trivial of exact size 
   LAYOUT-CONSTRAINT ::= 'M' LAYOUT-SIZE-AND-ALIGNMENT  // Trivial of size at most N bits 

diff --git a/lib/AST/ASTMangler.cpp b/lib/AST/ASTMangler.cpp
@@ -1765,6 +1765,12 @@ void ASTMangler::appendOpParamForLayoutConstraint(LayoutConstraint layout) {
   case LayoutConstraintKind::NativeRefCountedObject:
     appendOperatorParam("N");
     break;
+  case LayoutConstraintKind::Class:
+    appendOperatorParam("C");
+    break;
+  case LayoutConstraintKind::NativeClass:
+    appendOperatorParam("D");
+    break;
   case LayoutConstraintKind::Trivial:
     appendOperatorParam("T");
     break;

diff --git a/lib/AST/ASTPrinter.cpp b/lib/AST/ASTPrinter.cpp
@@ -4342,6 +4342,8 @@ void LayoutConstraintInfo::print(ASTPrinter &Printer,
   case LayoutConstraintKind::UnknownLayout:
   case LayoutConstraintKind::RefCountedObject:
   case LayoutConstraintKind::NativeRefCountedObject:
+  case LayoutConstraintKind::Class:
+  case LayoutConstraintKind::NativeClass:
   case LayoutConstraintKind::Trivial:
     return;
   case LayoutConstraintKind::TrivialOfAtMostSize:

diff --git a/lib/Demangling/Demangler.cpp b/lib/Demangling/Demangler.cpp
@@ -1837,6 +1837,10 @@ NodePointer Demangler::demangleGenericRequirement() {
       name = "R";
     } else if (c == 'N') {
       name = "N";
+    } else if (c == 'C') {
+      name = "C";
+    } else if (c == 'D') {
+      name = "D";
     } else if (c == 'T') {
       name = "T";
     } else if (c == 'E') {

diff --git a/lib/Demangling/NodePrinter.cpp b/lib/Demangling/NodePrinter.cpp
@@ -1561,6 +1561,10 @@ void NodePrinter::print(NodePointer pointer, bool asContext, bool suppressType)
       name = "_RefCountedObject";
     } else if (c == 'N') {
       name = "_NativeRefCountedObject";
+    } else if (c == 'C') {
+      name = "_Class";
+    } else if (c == 'D') {
+      name = "_NativeClass";
     } else if (c == 'T') {
       name = "_Trivial";
     } else if (c == 'E' || c == 'e') {