Merge pull request #11702 from gottesmm/pr-865d52d5d74dbdd085015ff761fb53e6c9614b8a

Author: swift-ci

lib/SILGen/SILGenBuilder.cpp

@@ -686,6 +686,13 @@ ManagedValue SILGenBuilder::createSuperMethod(SILLocation loc,
   return ManagedValue::forUnmanaged(v);
 }
 
+ManagedValue SILGenBuilder::
+createValueMetatype(SILLocation loc, SILType metatype,
+                    ManagedValue base) {
+  SILValue v = createValueMetatype(loc, metatype, base.getValue());
+  return ManagedValue::forUnmanaged(v);
+}
+
 //===----------------------------------------------------------------------===//
 //                            Switch Enum Builder
 //===----------------------------------------------------------------------===//

lib/SILGen/SILGenBuilder.h

@@ -301,6 +301,10 @@ class SILGenBuilder : public SILBuilder {
   ManagedValue createSuperMethod(SILLocation loc, ManagedValue operand,
                                  SILDeclRef member, SILType methodTy,
                                  bool isVolatile = false);
+
+  using SILBuilder::createValueMetatype;
+  ManagedValue createValueMetatype(SILLocation loc, SILType metatype,
+                                   ManagedValue base);
 };
 
 class SwitchCaseFullExpr;

lib/SILGen/SILGenExpr.cpp

@@ -2621,9 +2621,8 @@ SILValue SILGenFunction::emitMetatypeOfValue(SILLocation loc, Expr *baseExpr) {
   // dynamically from the instance.
   if (metaTy.castTo<MetatypeType>()->getRepresentation()
           != MetatypeRepresentation::Thin) {
-    auto base = emitRValueAsSingleValue(baseExpr,
-                               SGFContext::AllowImmediatePlusZero).getValue();
-    return B.createValueMetatype(loc, metaTy, base);
+    auto base = emitRValueAsSingleValue(baseExpr, SGFContext::AllowImmediatePlusZero);
+    return B.createValueMetatype(loc, metaTy, base).getValue();
   }
 
   // Otherwise, ignore the base and return the static thin metatype.