straighten out IRGen's @lvalue vs @inout handling. Since SILGen lowers all

@lvalue types, IRGen only needs to handle @inout.


Swift SVN r11799

Author: lattner

Diff for: lib/IRGen/GenDecl.cpp

@@ -1193,7 +1193,7 @@ llvm::Constant *IRGenModule::getAddrOfValueWitnessTable(CanType concreteType,
 static CanType addOwnerArgument(DeclContext *DC, CanType resultType) {
   Type argType = DC->getDeclaredTypeInContext();
   if (!argType->hasReferenceSemantics())
-    argType = LValueType::get(argType);
+    argType = InOutType::get(argType);
   if (auto params = DC->getGenericParamsOfContext())
     return PolymorphicFunctionType::get(argType, resultType, params)
              ->getCanonicalType();
@@ -1247,7 +1247,7 @@ FormalType IRGenModule::getTypeOfGetter(ValueDecl *value) {
   // (this clause is skipped for a non-subscript getter).
   unsigned uncurryLevel = 0;
   CanType formalType = CanType(FunctionType::get(TupleType::getEmpty(Context),
-                                              getObjectType(value)));
+                                                 getObjectType(value)));
   addIndexArgument(value, formalType, uncurryLevel);
   AbstractCC cc = addOwnerArgument(value, formalType, uncurryLevel);
 

Diff for: lib/IRGen/GenFunc.cpp

@@ -2217,7 +2217,6 @@ void irgen::emitFunctionPartialApplication(IRGenFunction &IGF,
     hasSingleSwiftRefcountedContext = Maybe;
 
   // Collect the type infos for the context types.
-  // FIXME: Keep LValueTypes out of this.
   SmallVector<const TypeInfo *, 4> argTypeInfos;
   for (SILType argType : argTypes) {
     auto &ti = IGF.getTypeInfoForLowered(argType.getSwiftType());

Diff for: lib/IRGen/GenMeta.cpp

@@ -547,8 +547,7 @@ namespace {
     }
 
     llvm::Value *visitLValueType(CanLValueType type) {
-      IGF.unimplemented(SourceLoc(), "metadata ref for l-value type");
-      return llvm::UndefValue::get(IGF.IGM.TypeMetadataPtrTy);
+      llvm_unreachable("should have been lowered by SILGen");
     }
     llvm::Value *visitInOutType(CanInOutType type) {
       IGF.unimplemented(SourceLoc(), "metadata ref for @inout type");

Diff for: lib/IRGen/GenPoly.cpp

@@ -260,11 +260,10 @@ namespace {
     // L-values go by the object type;  note that we ask the ordinary
     // question, not the argument question.
     bool visitLValueType(CanLValueType origTy, CanLValueType substTy) {
-      return differsByAbstractionInMemory(IGM,
-                                          origTy.getObjectType(),
-                                          substTy.getObjectType());
+      llvm_unreachable("should have been lowered by SILGen");
     }
-    // inout go by the object type;  note that we ask the ordinary
+        
+    // @inout go by the object type;  note that we ask the ordinary
     // question, not the argument question.
     bool visitInOutType(CanInOutType origTy, CanInOutType substTy) {
       return differsByAbstractionInMemory(IGM,
@@ -552,24 +551,7 @@ namespace {
     }
 
     void visitLValueType(CanLValueType origTy, CanLValueType substTy) {
-      CanType origObjectTy = origTy.getObjectType();
-      CanType substObjectTy = substTy.getObjectType();
-      if (differsByAbstractionInMemory(IGF.IGM, origObjectTy, substObjectTy))
-        IGF.unimplemented(SourceLoc(), "remapping l-values");
-
-      llvm::Value *substMV = In.claimNext();
-      if (origObjectTy == substObjectTy)
-        return Out.add(substMV);
-
-      // A bitcast will be sufficient.
-      auto &origObjectTI = IGF.IGM.getTypeInfoForUnlowered(origObjectTy);
-      auto origPtrTy = origObjectTI.getStorageType()->getPointerTo();
-
-      auto substValue = substMV;
-      auto origValue =
-        IGF.Builder.CreateBitCast(substValue, origPtrTy,
-                                  substValue->getName() + ".reinterpret");
-      Out.add(origValue);
+      llvm_unreachable("should have been lowered by SILGen");
     }
 
     void visitInOutType(CanInOutType origTy, CanInOutType substTy) {
@@ -734,23 +716,7 @@ namespace {
     }
 
     void visitLValueType(CanLValueType origTy, CanLValueType substTy) {
-      CanType origObjectTy = origTy.getObjectType();
-      CanType substObjectTy = substTy.getObjectType();
-      if (differsByAbstractionInMemory(IGF.IGM, origObjectTy, substObjectTy))
-        IGF.unimplemented(SourceLoc(), "remapping l-values");
-
-      llvm::Value *origMV = In.claimNext();
-      if (origObjectTy == substObjectTy)
-        return Out.add(origMV);
-
-      // A bitcast will be sufficient.
-      auto &substObjectTI = IGF.IGM.getTypeInfoForUnlowered(substObjectTy);
-      auto substPtrTy = substObjectTI.getStorageType()->getPointerTo();
-
-      auto substValue =
-        IGF.Builder.CreateBitCast(origMV, substPtrTy,
-                                  origMV->getName() + ".reinterpret");
-      Out.add(substValue);
+      llvm_unreachable("should have been lowered by SILGen");
     }
     void visitInOutType(CanInOutType origTy, CanInOutType substTy) {
       CanType origObjectTy = origTy.getObjectType();

Diff for: lib/IRGen/GenType.h

@@ -31,7 +31,6 @@ namespace swift {
   class ClassDecl;
   class AnyFunctionType;
   class InOutType;
-  class LValueType;
   class MetatypeType;
   class ModuleType;
   class NominalTypeDecl;