Merge pull request #62501 from nate-chandler/remove-in-constant

[SIL] Removed Indirect_In_Constant convention.

Author: nate-chandler

SwiftCompilerSources/Sources/SIL/Argument.swift

@@ -86,11 +86,6 @@ public enum ArgumentConvention {
   /// object.
   case indirectIn
 
-  /// This argument is passed indirectly, i.e. by directly passing the address
-  /// of an object in memory.  The callee must treat the object as read-only
-  /// The callee may assume that the address does not alias any valid object.
-  case indirectInConstant
-
   /// This argument is passed indirectly, i.e. by directly passing the address
   /// of an object in memory.  The callee may not modify and does not destroy
   /// the object.
@@ -130,7 +125,7 @@ public enum ArgumentConvention {
 
   public var isIndirect: Bool {
     switch self {
-    case .indirectIn, .indirectInConstant, .indirectInGuaranteed,
+    case .indirectIn, .indirectInGuaranteed,
          .indirectInout, .indirectInoutAliasable, .indirectOut:
       return true
     case .directOwned, .directUnowned, .directGuaranteed:
@@ -140,7 +135,7 @@ public enum ArgumentConvention {
 
   public var isIndirectIn: Bool {
     switch self {
-    case .indirectIn, .indirectInConstant, .indirectInGuaranteed:
+    case .indirectIn, .indirectInGuaranteed:
       return true
     case .directOwned, .directUnowned, .directGuaranteed,
          .indirectInout, .indirectInoutAliasable, .indirectOut:
@@ -152,7 +147,7 @@ public enum ArgumentConvention {
     switch self {
     case .indirectInGuaranteed, .directGuaranteed:
       return true
-    case .indirectIn, .indirectInConstant, .directOwned, .directUnowned,
+    case .indirectIn, .directOwned, .directUnowned,
          .indirectInout, .indirectInoutAliasable, .indirectOut:
       return false
     }
@@ -161,7 +156,6 @@ public enum ArgumentConvention {
   public var isExclusiveIndirect: Bool {
     switch self {
     case .indirectIn,
-         .indirectInConstant,
          .indirectOut,
          .indirectInGuaranteed,
          .indirectInout:
@@ -182,7 +176,6 @@ public enum ArgumentConvention {
       return true
 
     case .indirectIn,
-         .indirectInConstant,
          .indirectOut,
          .indirectInGuaranteed,
          .directUnowned,
@@ -205,7 +198,6 @@ extension BridgedArgumentConvention {
   var convention: ArgumentConvention {
     switch self {
       case ArgumentConvention_Indirect_In:             return .indirectIn
-      case ArgumentConvention_Indirect_In_Constant:    return .indirectInConstant
       case ArgumentConvention_Indirect_In_Guaranteed:  return .indirectInGuaranteed
       case ArgumentConvention_Indirect_Inout:          return .indirectInout
       case ArgumentConvention_Indirect_InoutAliasable: return .indirectInoutAliasable

SwiftCompilerSources/Sources/SIL/Effects.swift

@@ -491,7 +491,7 @@ public struct SideEffects : CustomStringConvertible, NoReflectionChildren {
         result.ownership = SideEffects.Ownership()
       }
       switch convention {
-      case .indirectIn, .indirectInConstant:
+      case .indirectIn:
         result.memory.write = false
       case .indirectInGuaranteed:
         result.memory.write = false

include/swift/AST/Types.h

@@ -3707,11 +3707,6 @@ enum class ParameterConvention : uint8_t {
   /// object.
   Indirect_In,
 
-  /// This argument is passed indirectly, i.e. by directly passing the address
-  /// of an object in memory.  The callee must treat the object as read-only
-  /// The callee may assume that the address does not alias any valid object.
-  Indirect_In_Constant,
-
   /// This argument is passed indirectly, i.e. by directly passing the address
   /// of an object in memory.  The callee may not modify and does not destroy
   /// the object.
@@ -3754,7 +3749,6 @@ static_assert(unsigned(ParameterConvention::Direct_Guaranteed) < (1<<3),
 inline bool isIndirectFormalParameter(ParameterConvention conv) {
   switch (conv) {
   case ParameterConvention::Indirect_In:
-  case ParameterConvention::Indirect_In_Constant:
   case ParameterConvention::Indirect_Inout:
   case ParameterConvention::Indirect_InoutAliasable:
   case ParameterConvention::Indirect_In_Guaranteed:
@@ -3770,7 +3764,6 @@ inline bool isIndirectFormalParameter(ParameterConvention conv) {
 inline bool isConsumedParameter(ParameterConvention conv) {
   switch (conv) {
   case ParameterConvention::Indirect_In:
-  case ParameterConvention::Indirect_In_Constant:
   case ParameterConvention::Direct_Owned:
     return true;
 
@@ -3796,7 +3789,6 @@ inline bool isGuaranteedParameter(ParameterConvention conv) {
   case ParameterConvention::Indirect_Inout:
   case ParameterConvention::Indirect_InoutAliasable:
   case ParameterConvention::Indirect_In:
-  case ParameterConvention::Indirect_In_Constant:
   case ParameterConvention::Direct_Unowned:
   case ParameterConvention::Direct_Owned:
     return false;

include/swift/SIL/ApplySite.h

@@ -386,7 +386,6 @@ class ApplySite {
       return pai->isOnStack() ? SILArgumentConvention::Direct_Guaranteed
                               : SILArgumentConvention::Direct_Owned;
     case SILArgumentConvention::Indirect_In:
-    case SILArgumentConvention::Indirect_In_Constant:
     case SILArgumentConvention::Indirect_In_Guaranteed:
       return pai->isOnStack() ? SILArgumentConvention::Indirect_In_Guaranteed
                               : SILArgumentConvention::Indirect_In;

include/swift/SIL/SILArgumentConvention.h

@@ -25,7 +25,6 @@ namespace swift {
 struct SILArgumentConvention {
   enum ConventionType : uint8_t {
     Indirect_In,
-    Indirect_In_Constant,
     Indirect_In_Guaranteed,
     Indirect_Inout,
     Indirect_InoutAliasable,
@@ -43,9 +42,6 @@ struct SILArgumentConvention {
     case ParameterConvention::Indirect_In:
       Value = SILArgumentConvention::Indirect_In;
       return;
-    case ParameterConvention::Indirect_In_Constant:
-      Value = SILArgumentConvention::Indirect_In_Constant;
-      return;
     case ParameterConvention::Indirect_Inout:
       Value = SILArgumentConvention::Indirect_Inout;
       return;
@@ -81,7 +77,6 @@ struct SILArgumentConvention {
         return true;
       case SILArgumentConvention::Indirect_In_Guaranteed:
       case SILArgumentConvention::Indirect_In:
-      case SILArgumentConvention::Indirect_In_Constant:
       case SILArgumentConvention::Indirect_Out:
       case SILArgumentConvention::Direct_Unowned:
       case SILArgumentConvention::Direct_Owned:
@@ -94,7 +89,6 @@ struct SILArgumentConvention {
   bool isOwnedConvention() const {
     switch (Value) {
     case SILArgumentConvention::Indirect_In:
-    case SILArgumentConvention::Indirect_In_Constant:
     case SILArgumentConvention::Direct_Owned:
       return true;
     case SILArgumentConvention::Indirect_In_Guaranteed:
@@ -115,7 +109,6 @@ struct SILArgumentConvention {
       return true;
     case SILArgumentConvention::Indirect_Inout:
     case SILArgumentConvention::Indirect_In:
-    case SILArgumentConvention::Indirect_In_Constant:
     case SILArgumentConvention::Indirect_Out:
     case SILArgumentConvention::Indirect_InoutAliasable:
     case SILArgumentConvention::Direct_Unowned:
@@ -129,7 +122,6 @@ struct SILArgumentConvention {
   bool isExclusiveIndirectParameter() {
     switch (Value) {
     case SILArgumentConvention::Indirect_In:
-    case SILArgumentConvention::Indirect_In_Constant:
     case SILArgumentConvention::Indirect_Out:
     case SILArgumentConvention::Indirect_In_Guaranteed:
     case SILArgumentConvention::Indirect_Inout:

include/swift/SIL/SILBridging.h

@@ -186,7 +186,6 @@ typedef enum {
 
 typedef enum {
   ArgumentConvention_Indirect_In,
-  ArgumentConvention_Indirect_In_Constant,
   ArgumentConvention_Indirect_In_Guaranteed,
   ArgumentConvention_Indirect_Inout,
   ArgumentConvention_Indirect_InoutAliasable,

include/swift/SIL/SILFunctionConventions.h

@@ -519,7 +519,6 @@ inline bool SILModuleConventions::isIndirectSILParam(SILParameterInfo param,
     return false;
 
   case ParameterConvention::Indirect_In:
-  case ParameterConvention::Indirect_In_Constant:
   case ParameterConvention::Indirect_In_Guaranteed:
     return (loweredAddresses ||
             param.getInterfaceType()->isOpenedExistentialWithError());

lib/AST/ASTDemangler.cpp

@@ -422,9 +422,8 @@ static ParameterConvention
 getParameterConvention(ImplParameterConvention conv) {
   switch (conv) {
   case Demangle::ImplParameterConvention::Indirect_In:
-    return ParameterConvention::Indirect_In;
   case Demangle::ImplParameterConvention::Indirect_In_Constant:
-    return ParameterConvention::Indirect_In_Constant;
+    return ParameterConvention::Indirect_In;
   case Demangle::ImplParameterConvention::Indirect_In_Guaranteed:
     return ParameterConvention::Indirect_In_Guaranteed;
   case Demangle::ImplParameterConvention::Indirect_Inout:

lib/AST/ASTMangler.cpp

@@ -1861,8 +1861,6 @@ static char getParamConvention(ParameterConvention conv) {
   // different places.
   switch (conv) {
     case ParameterConvention::Indirect_In: return 'i';
-    case ParameterConvention::Indirect_In_Constant:
-      return 'c';
     case ParameterConvention::Indirect_Inout: return 'l';
     case ParameterConvention::Indirect_InoutAliasable: return 'b';
     case ParameterConvention::Indirect_In_Guaranteed: return 'n';

lib/AST/ASTPrinter.cpp

@@ -6197,7 +6197,6 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
       Printer << "@callee_guaranteed ";
       return;
     case ParameterConvention::Indirect_In:
-    case ParameterConvention::Indirect_In_Constant:
     case ParameterConvention::Indirect_Inout:
     case ParameterConvention::Indirect_InoutAliasable:
     case ParameterConvention::Indirect_In_Guaranteed:
@@ -6815,8 +6814,6 @@ std::string GenericSignature::getAsString() const {
 static StringRef getStringForParameterConvention(ParameterConvention conv) {
   switch (conv) {
   case ParameterConvention::Indirect_In: return "@in ";
-  case ParameterConvention::Indirect_In_Constant:
-    return "@in_constant ";
   case ParameterConvention::Indirect_In_Guaranteed:  return "@in_guaranteed ";
   case ParameterConvention::Indirect_Inout: return "@inout ";
   case ParameterConvention::Indirect_InoutAliasable: return "@inout_aliasable ";