Require Builtin.valueToBridgeObject to have a builtin integer as argument

Previously it was used with an UInt struct argument. But this is bad because UInt is a type defined in the stdlib.

Author: eeckstein

lib/IRGen/GenConstant.cpp

@@ -105,9 +105,7 @@ static llvm::Constant *emitConstantValue(IRGenModule &IGM, SILValue operand) {
         llvm_unreachable("unsupported builtin for constant expression");
     }
   } else if (auto *VTBI = dyn_cast<ValueToBridgeObjectInst>(operand)) {
-    auto *SI = cast<StructInst>(VTBI->getOperand());
-    assert(SI->getElements().size() == 1);
-    auto *val = emitConstantValue(IGM, SI->getElements()[0]);
+    auto *val = emitConstantValue(IGM, VTBI->getOperand());
     auto *sTy = IGM.getTypeInfo(VTBI->getType()).getStorageType();
     return llvm::ConstantExpr::getIntToPtr(val, sTy);
   } else {

lib/SILGen/SILGenBuiltin.cpp

@@ -867,9 +867,15 @@ static ManagedValue emitBuiltinValueToBridgeObject(SILGenFunction &SGF,
   assert(args.size() == 1 && "ValueToBridgeObject should have one argument");
   assert(subs.getReplacementTypes().size() == 1 &&
          "ValueToBridgeObject should have one sub");
-  auto &fromTL = SGF.getTypeLowering(subs.getReplacementTypes()[0]);
-  assert(fromTL.isTrivial() && "Expected a trivial type");
-  (void)fromTL;
+
+  Type argTy = subs.getReplacementTypes()[0];
+  if (!argTy->is<BuiltinIntegerType>()) {
+    SGF.SGM.diagnose(loc, diag::invalid_sil_builtin,
+                     "argument to builtin should be a builtin integer");
+    SILType objPointerType = SILType::getBridgeObjectType(SGF.F.getASTContext());
+    SILValue undef = SILUndef::get(objPointerType, SGF.SGM.M);
+    return ManagedValue::forUnmanaged(undef);
+  }
 
   SILValue result = SGF.B.createValueToBridgeObject(loc, args[0].getValue());
   return SGF.emitManagedRetain(loc, result);

stdlib/public/core/Builtin.swift

@@ -458,7 +458,7 @@ public func _bridgeObject(
 @inlinable
 public func _bridgeObject(fromTagged x: UInt) -> Builtin.BridgeObject {
   _sanityCheck(x & _bridgeObjectTaggedPointerBits != 0)
-  let object: Builtin.BridgeObject = Builtin.valueToBridgeObject(x)
+  let object: Builtin.BridgeObject = Builtin.valueToBridgeObject(x._value)
   _sanityCheck(_isTaggedObject(object))
   return object
 }

test/SILGen/builtins.swift

@@ -809,12 +809,13 @@ func once(control: Builtin.RawPointer) {
 
 // CHECK-LABEL: sil hidden @$s8builtins19valueToBridgeObjectyBbSuF : $@convention(thin) (UInt) -> @owned Builtin.BridgeObject {
 // CHECK: bb0([[UINT:%.*]] : @trivial $UInt):
-// CHECK:   [[CAST:%.*]] = value_to_bridge_object [[UINT]] : $UInt
+// CHECK:   [[BI:%.*]] = struct_extract [[UINT]] : $UInt, #UInt._value
+// CHECK:   [[CAST:%.*]] = value_to_bridge_object [[BI]]
 // CHECK:   [[RET:%.*]] = copy_value [[CAST]] : $Builtin.BridgeObject
 // CHECK:   return [[RET]] : $Builtin.BridgeObject
 // CHECK: } // end sil function '$s8builtins19valueToBridgeObjectyBbSuF'
 func valueToBridgeObject(_ x: UInt) -> Builtin.BridgeObject {
-  return Builtin.valueToBridgeObject(x)
+  return Builtin.valueToBridgeObject(x._value)
 }
 
 // CHECK-LABEL: sil hidden @$s8builtins10assumeTrueyyBi1_F