SILGen: Remove InOutInitialization and its related "AddressBinding" initialization kind.

We don't need these now that we don't set up argument bindings via initializations.

Swift SVN r24413

Author: jckarter

lib/SILGen/Initialization.h

@@ -47,9 +47,6 @@ class Initialization {
     /// This Initialization is for a _ binding or other ignored value; the
     /// corresponding result can be discarded.
     Ignored,
-    /// This Initialization is for an inout or address-only argument binding,
-    /// which is initialized using bindAddress().
-    AddressBinding,
     /// This Initialization is to bind a 'let' declaration into VarLocs
     /// directly.
     LetValue,
@@ -84,13 +81,6 @@ class Initialization {
   /// SILValue of that buffer's address. If not, returns an invalid SILValue.
   virtual SILValue getAddressOrNull() const = 0;
 
-  /// Binds an address value to this initialization. Called only on
-  /// initializations with Kind::AddressBinding.
-  virtual void bindAddress(SILValue address, SILGenFunction &gen,
-                           SILLocation loc) {
-    llvm_unreachable("unexpected address value in initialization!");
-  }
-
   /// Provide a value to this initialization.  Called only on
   /// initializations with Kind::Translating.
   virtual void translateValue(SILGenFunction &gen, SILLocation loc,

lib/SILGen/RValue.cpp

@@ -239,8 +239,6 @@ class CopyIntoTupleValues
     values = values.slice(1);
 
     switch (I->kind) {
-    case Initialization::Kind::AddressBinding:
-      llvm_unreachable("cannot emit into a inout binding");
     case Initialization::Kind::Tuple:
       llvm_unreachable("tuple initialization not destructured?!");
 
@@ -321,8 +319,6 @@ class InitializeTupleValues
     values = values.slice(1);
 
     switch (I->kind) {
-    case Initialization::Kind::AddressBinding:
-      llvm_unreachable("cannot emit into a inout binding");
     case Initialization::Kind::Tuple:
       llvm_unreachable("tuple initialization not destructured?!");
 

lib/SILGen/SILGenDecl.cpp

@@ -74,7 +74,6 @@ bool Initialization::canForwardInBranch() const {
     return true;
 
   // These initializations expect to be activated exactly once.
-  case Kind::AddressBinding:
   case Kind::LetValue:
   case Kind::Translating:
     return false;
@@ -126,8 +125,6 @@ Initialization::getSubInitializationsForTuple(SILGenFunction &gen, CanType type,
     // This could actually be done by collecting translated values, if
     // we introduce new needs for translating initializations.
     llvm_unreachable("cannot destructure a translating initialization");
-  case Kind::AddressBinding:
-    llvm_unreachable("cannot destructure an address binding initialization");
   }
   llvm_unreachable("bad initialization kind");
 }
@@ -461,52 +458,6 @@ class CleanupWriteBackToInOut : public Cleanup {
   }
 };
 
-/// Initialize a writeback buffer that receives the "in" value of a inout
-/// argument on function entry and writes the "out" value back to the inout
-/// address on function exit.
-class InOutInitialization : public Initialization {
-  /// The VarDecl for the inout symbol.
-  VarDecl *vd;
-public:
-  InOutInitialization(VarDecl *vd)
-    : Initialization(Initialization::Kind::AddressBinding), vd(vd) {}
-
-  SILValue getAddressOrNull() const override {
-    llvm_unreachable("inout argument should be bound by bindAddress");
-  }
-  ArrayRef<InitializationPtr> getSubInitializations() const override {
-    return {};
-  }
-
-  void bindAddress(SILValue address, SILGenFunction &gen,
-                   SILLocation loc) override {
-    CanType objectType =
-      cast<InOutType>(vd->getType()->getCanonicalType()).getObjectType();
-
-    // As a special case, don't introduce a local variable for
-    // Builtin.UnsafeValueBuffer, which is not copyable.
-    if (isa<BuiltinUnsafeValueBufferType>(objectType)) {
-      // FIXME: mark a debug location?
-      gen.VarLocs[vd] = SILGenFunction::VarLoc::get(address);
-      return;
-    }
-
-    // Allocate the local variable for the inout.
-    auto initVar = gen.emitLocalVariableWithCleanup(vd, false);
-
-    // Initialize with the value from the inout with an "autogenerated"
-    // copyaddr.
-    loc.markAsPrologue();
-    loc.markAutoGenerated();
-    gen.B.createCopyAddr(loc, address, initVar->getAddress(),
-                         IsNotTake, IsInitialization);
-    initVar->finishInitialization(gen);
-
-    // Set up a cleanup to write back to the inout.
-    gen.Cleanups.pushCleanup<CleanupWriteBackToInOut>(vd, address);
-  }
-};
-
 /// Initialize a variable of reference-storage type.
 class ReferenceStorageInitialization : public Initialization {
   InitializationPtr VarInit;
@@ -666,10 +617,7 @@ SILGenFunction::emitInitializationForVarDecl(VarDecl *vd, Type patternType) {
 
   CanType varType = vd->getType()->getCanonicalType();
 
-  // If this is an inout parameter, set up the writeback variable.
-  if (isa<InOutType>(varType)) {
-    return InitializationPtr(new InOutInitialization(vd));
-  }
+  assert(!isa<InOutType>(varType) && "local variables should never be inout");
 
   // If this is a 'let' initialization for a non-global, set up a
   // let binding, which stores the initialization value into VarLocs directly.

lib/SILGen/SILGenExpr.cpp

@@ -1019,8 +1019,6 @@ static SILValue getAddressForInPlaceInitialization(Initialization *I) {
 
   SILValue address;
   switch (I->kind) {
-  case Initialization::Kind::AddressBinding:
-    llvm_unreachable("can't emit into address binding");
   case Initialization::Kind::LetValue:
     // Emit into the buffer that 'let's produce for address-only values if
     // we have it.