Merge remote-tracking branch 'origin/master' into master-next

Author: swift-ci

lib/SILGen/SILGenExpr.cpp

@@ -1264,9 +1264,8 @@ RValue RValueEmitter::visitDerivedToBaseExpr(DerivedToBaseExpr *E,
   if (original.getType() == loweredResultTy)
     return RValue(SGF, E, original);
 
-  SILValue converted = SGF.B.createUpcast(E, original.getValue(), 
-                                          loweredResultTy);
-  return RValue(SGF, E, ManagedValue(converted, original.getCleanup()));
+  ManagedValue converted = SGF.B.createUpcast(E, original, loweredResultTy);
+  return RValue(SGF, E, converted);
 }
 
 RValue RValueEmitter::visitMetatypeConversionExpr(MetatypeConversionExpr *E,

lib/SILOptimizer/Mandatory/AddressLowering.cpp

@@ -99,6 +99,7 @@
 #include "swift/SILOptimizer/Utils/Local.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/SetVector.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 
 using namespace swift;

test/SILGen/objc_ownership_conventions.swift

@@ -147,7 +147,7 @@ func test10(_ g: Gizmo) -> AnyClass {
   // CHECK-NEXT: [[THICK:%.*]] = objc_to_thick_metatype [[OBJC]]
   // CHECK:      [[T0:%.*]] = enum $Optional<@thick AnyObject.Type>, #Optional.some!enumelt.1, [[THICK]]
   // CHECK:   bb5([[RES:%.*]] : $@thick AnyObject.Type):
-  // CHECK:      destroy_value [[G_COPY]] : $Gizmo
+  // CHECK:      destroy_value [[NS_G_COPY]] : $NSObject
   // CHECK:      destroy_value [[G]] : $Gizmo
   // CHECK-NEXT: return [[RES]] : $@thick AnyObject.Type
   return g.classProp
@@ -169,7 +169,7 @@ func test11(_ g: Gizmo) -> AnyClass {
   // CHECK:   bb5([[RES:%.*]] : $@thick NSAnsing.Type):
   // CHECK:      [[OPENED:%.*]] = open_existential_metatype [[RES]]
   // CHECK:      [[RES_ANY:%.*]] = init_existential_metatype [[OPENED]]
-  // CHECK:      destroy_value [[G_COPY]] : $Gizmo
+  // CHECK:      destroy_value [[NS_G_COPY]] : $NSObject
   // CHECK:      destroy_value [[G]] : $Gizmo
   // CHECK-NEXT: return [[RES_ANY]] : $@thick AnyObject.Type
   return g.qualifiedClassProp