Merge pull request #2957 from jckarter/optional-unwrap-source-loc

Author: swift-ci

lib/SILGen/SILGenConvert.cpp

@@ -157,6 +157,46 @@ static CanType getOptionalValueType(SILType optType,
   return generic.getGenericArgs()[0];
 }
 
+static void emitSourceLocationArgs(SILGenFunction &gen,
+                                   SILLocation loc,
+                                   ManagedValue (&args)[4]) {
+  auto &ctx = gen.getASTContext();
+  auto sourceLoc = loc.getSourceLoc();
+  
+  StringRef filename = "";
+  unsigned line = 0;
+  if (sourceLoc.isValid()) {
+    unsigned bufferID = ctx.SourceMgr.findBufferContainingLoc(sourceLoc);
+    filename = ctx.SourceMgr.getIdentifierForBuffer(bufferID);
+    line = ctx.SourceMgr.getLineAndColumn(sourceLoc).first;
+  }
+  
+  bool isASCII = true;
+  for (unsigned char c : filename) {
+    if (c > 127) {
+      isASCII = false;
+      break;
+    }
+  }
+  
+  auto wordTy = SILType::getBuiltinWordType(ctx);
+  auto i1Ty = SILType::getBuiltinIntegerType(1, ctx);
+  
+  // File
+  SILValue literal = gen.B.createStringLiteral(loc, filename,
+                                             StringLiteralInst::Encoding::UTF8);
+  args[0] = ManagedValue::forUnmanaged(literal);
+  // File length
+  literal = gen.B.createIntegerLiteral(loc, wordTy, filename.size());
+  args[1] = ManagedValue::forUnmanaged(literal);
+  // File is ascii
+  literal = gen.B.createIntegerLiteral(loc, i1Ty, isASCII);
+  args[2] = ManagedValue::forUnmanaged(literal);
+  // Line
+  literal = gen.B.createIntegerLiteral(loc, wordTy, line);
+  args[3] = ManagedValue::forUnmanaged(literal);
+}
+
 void SILGenFunction::emitPreconditionOptionalHasValue(SILLocation loc,
                                                       SILValue optional) {
   OptionalTypeKind OTK;
@@ -181,7 +221,10 @@ void SILGenFunction::emitPreconditionOptionalHasValue(SILLocation loc,
   // Call the standard library implementation of _diagnoseUnexpectedNilOptional.
   if (auto diagnoseFailure =
         getASTContext().getDiagnoseUnexpectedNilOptional(nullptr)) {
-    emitApplyOfLibraryIntrinsic(loc, diagnoseFailure, {}, {},
+    ManagedValue args[4];
+    emitSourceLocationArgs(*this, loc, args);
+    
+    emitApplyOfLibraryIntrinsic(loc, diagnoseFailure, {}, args,
                                 SGFContext());
   }
 

lib/SILGen/SILGenExpr.cpp

@@ -2033,7 +2033,7 @@ getMagicFunctionString(SILGenFunction &gen) {
 
 RValue RValueEmitter::
 visitMagicIdentifierLiteralExpr(MagicIdentifierLiteralExpr *E, SGFContext C) {
-  ASTContext &Ctx = SGF.SGM.M.getASTContext();
+  ASTContext &Ctx = SGF.getASTContext();
   SILType Ty = SGF.getLoweredLoadableType(E->getType());
   SourceLoc Loc;
 

stdlib/public/core/Optional.swift

@@ -286,9 +286,16 @@ extension Optional : CustomReflectable {
 
 @_transparent
 public // COMPILER_INTRINSIC
-func _diagnoseUnexpectedNilOptional() {
+func _diagnoseUnexpectedNilOptional(_filenameStart: Builtin.RawPointer,
+                                    _filenameLength: Builtin.Word,
+                                    _filenameIsASCII: Builtin.Int1,
+                                    _line: Builtin.Word) {
   _preconditionFailure(
-    "unexpectedly found nil while unwrapping an Optional value")
+    "unexpectedly found nil while unwrapping an Optional value",
+    file: StaticString(_start: _filenameStart,
+                       utf8CodeUnitCount: _filenameLength,
+                       isASCII: _filenameIsASCII),
+    line: UInt(_line))
 }
 
 public func == <T: Equatable> (lhs: T?, rhs: T?) -> Bool {

test/SILGen/optional_lvalue.swift

@@ -3,8 +3,8 @@
 // CHECK-LABEL: sil hidden @_TF15optional_lvalue22assign_optional_lvalueFTRGSqSi_Si_T_
 // CHECK:         [[SHADOW:%.*]] = alloc_box $Optional<Int>
 // CHECK:         [[PB:%.*]] = project_box [[SHADOW]]
-// CHECK:         [[PRECOND:%.*]] = function_ref @_TFs30_diagnoseUnexpectedNilOptionalFT_T_
-// CHECK:         apply [[PRECOND]]()
+// CHECK:         [[PRECOND:%.*]] = function_ref @_TFs30_diagnoseUnexpectedNilOptional
+// CHECK:         apply [[PRECOND]](
 // CHECK:         [[PAYLOAD:%.*]] = unchecked_take_enum_data_addr [[PB]] : $*Optional<Int>, #Optional.some!enumelt.1
 // CHECK:         assign {{%.*}} to [[PAYLOAD]]
 func assign_optional_lvalue(_ x: inout Int?, _ y: Int) {
@@ -14,8 +14,8 @@ func assign_optional_lvalue(_ x: inout Int?, _ y: Int) {
 // CHECK-LABEL: sil hidden @_TF15optional_lvalue17assign_iuo_lvalueFTRGSQSi_Si_T_
 // CHECK:         [[SHADOW:%.*]] = alloc_box $ImplicitlyUnwrappedOptional<Int>
 // CHECK:         [[PB:%.*]] = project_box [[SHADOW]]
-// CHECK:         [[PRECOND:%.*]] = function_ref @_TFs30_diagnoseUnexpectedNilOptionalFT_T_
-// CHECK:         apply [[PRECOND]]()
+// CHECK:         [[PRECOND:%.*]] = function_ref @_TFs30_diagnoseUnexpectedNilOptional
+// CHECK:         apply [[PRECOND]](
 // CHECK:         [[PAYLOAD:%.*]] = unchecked_take_enum_data_addr [[PB]] : $*ImplicitlyUnwrappedOptional<Int>, #ImplicitlyUnwrappedOptional.some!enumelt.1
 // CHECK:         assign {{%.*}} to [[PAYLOAD]]
 func assign_iuo_lvalue(_ x: inout Int!, _ y: Int) {